1 files changed, 587 insertions, 229 deletions

diff --git a/po/ca.po b/po/ca.po
index 44254c8b..d3e34db3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,461 +7,687 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-10-09 22:58+0200\n"
+"POT-Creation-Date: 2009-02-12 20:22+0100\n"
 "PO-Revision-Date: 2008-07-03 17:21+0000\n"
 "Last-Translator: Habari <thomas.becerril@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
-#: src/gui/sell.cpp:241
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "preu %d GP / total %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "sortir"
 
-#: 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
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:272
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: 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
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:74
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr ""
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:75
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/char_select.cpp:91
-msgid "Account and Character Management"
+#: src/gui/char_select.cpp:81
+msgid "Select Character"
 msgstr ""
 
-#: 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
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "ok"
 
-#: src/gui/char_select.cpp: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:57
-#: src/gui/trade.cpp:62
-msgid "Cancel"
-msgstr ""
-
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr ""
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223
 msgid "Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:99
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr ""
 
-#: src/gui/char_select.cpp:100
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr ""
 
-#: src/gui/char_select.cpp:101
-msgid "Unregister"
-msgstr ""
-
-#: src/gui/char_select.cpp:102
-msgid "Change Password"
-msgstr ""
-
-#: src/gui/char_select.cpp:103
-msgid "Change Email Address"
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269
+#, c-format
+msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:105
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
-msgid "Account: %s"
+msgid "Level: %d"
 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
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, c-format
-msgid "Name: %s"
+msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
-#: src/gui/char_select.cpp:223
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
-msgid "Level: %d"
+msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
-#: src/gui/char_select.cpp:224
+#: src/gui/char_select.cpp:174
 #, c-format
-msgid "Money: %d"
+msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:268
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79
 msgid "Name:"
 msgstr "nom"
 
-#: src/gui/char_select.cpp:278
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr ""
 
-#: src/gui/char_select.cpp:281
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr ""
 
-#: src/gui/char_select.cpp:282
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr ""
 
-#: src/gui/char_select.cpp:285
-msgid "Male"
+#: src/gui/char_server.cpp:52
+msgid "Select Server"
 msgstr ""
 
-#: src/gui/char_select.cpp:286
-msgid "Female"
+#: src/gui/char_server.cpp:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
+msgid "OK"
+msgstr ""
+
+#: src/gui/chat.cpp:115
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:118
+#, c-format
+msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/char_select.cpp:290
-msgid "Strength:"
+#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82
+msgid "Server:"
 msgstr ""
 
-#: src/gui/char_select.cpp:291
-msgid "Agility:"
+#: src/gui/chat.cpp:139
+#, c-format
+msgid "%s whispers:"
 msgstr ""
 
-#: src/gui/char_select.cpp:292
-msgid "Dexterity:"
+#: src/gui/chat.cpp:276
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:293
-msgid "Vitality:"
+#: src/gui/chat.cpp:349
+msgid "Unknown command"
 msgstr ""
 
-#: src/gui/char_select.cpp:294
-msgid "Intelligence:"
+#: src/gui/chat.cpp:359
+msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/char_select.cpp:295
-msgid "Willpower:"
+#: src/gui/chat.cpp:362
+msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
-#, c-format
-msgid "Please distribute %d points"
+#: src/gui/chat.cpp:365
+msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
-#: src/gui/serverdialog.cpp:171
-msgid "Error"
+#: src/gui/chat.cpp:368
+msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/char_select.cpp:417
-msgid "Your name needs to be at least 4 characters."
+#: src/gui/chat.cpp:371
+msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/char_select.cpp:469
-msgid "Character stats OK"
+#: src/gui/chat.cpp:374
+msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/char_select.cpp:481
-#, c-format
-msgid "Please remove %d points"
+#: src/gui/chat.cpp:382
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:385
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:388
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:391
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:394
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:397
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:400
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:403
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:406
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:409
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:412
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:418
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:421
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:424
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:489
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:492
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:493
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:494
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:495
+msgid "/where: Display map name"
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:37
+#: src/gui/chat.cpp:496
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:498
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:523
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:524
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:529
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:538
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:540
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:546
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:551
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:552
+msgid "Type /help for a list of commands."
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "si"
 
-#: src/gui/confirm_dialog.cpp:38
+#: src/gui/confirm_dialog.cpp:36
 msgid "No"
 msgstr "no"
 
-#: src/gui/connection.cpp:43
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:66
-msgid "Unequip"
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:69
+#: src/gui/inventorywindow.cpp:57
 msgid "Drop"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:70
-msgid "Split"
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:178
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:228
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:83
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:87
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/item_amount.cpp:91
-msgid "Select amount of items to split."
-msgstr ""
-
-#: src/gui/login.cpp:43
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:46 src/gui/register.cpp:68
+#: src/gui/login.cpp:45 src/gui/register.cpp:80
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:49
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89
 msgid "Register"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:63
+#: src/gui/menuwindow.cpp:61
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:67
-msgid "Guilds"
-msgstr ""
-
-#: src/gui/menuwindow.cpp:68
+#: src/gui/menuwindow.cpp:65
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr ""
 
-#: src/gui/minimap.cpp:36
+#: src/gui/minimap.cpp:34
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:37 src/gui/npc_text.cpp:37
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:79
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: src/gui/npcintegerdialog.cpp:45
+msgid "Reset"
+msgstr ""
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:81
 #, c-format
-msgid "@@guild|Invite %s@@"
+msgid "@@trade|Trade With %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:83
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "@@attack|Attack %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:283
+msgid "@@use|Unequip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:234
+#: src/gui/popupmenu.cpp:288
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:290
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:291
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
-msgid "@@split|Split@@"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:42
-msgid "Switch server"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:43
-msgid "Switch character"
+#: src/gui/register.cpp:81
+msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:69
-msgid "Confirm:"
+#: src/gui/register.cpp:87
+msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:70
-msgid "Email:"
+#: src/gui/register.cpp:88
+msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:168
+#: src/gui/register.cpp:159
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: src/gui/register.cpp:167
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:184
+#: src/gui/register.cpp:175
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: src/gui/register.cpp:183
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:199
+#: src/gui/register.cpp:190
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
-msgid "Sell"
+#: src/gui/register.cpp:210 src/main.cpp:954
+msgid "Error"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:77
-msgid "Choose your Mana World Server"
+#: src/gui/setup.cpp:58
+msgid "Apply"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:79
-msgid "Server:"
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr ""
+
+#: src/gui/setup.cpp:78
+msgid "Video"
+msgstr ""
+
+#: src/gui/setup.cpp:82
+msgid "Audio"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:80
-msgid "Port:"
+#: src/gui/setup.cpp:86
+msgid "Joystick"
+msgstr ""
+
+#: src/gui/setup.cpp:90
+msgid "Keyboard"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:172
-msgid "Please type both the address and the port of a server."
+#: src/gui/setup.cpp:94
+msgid "Players"
 msgstr ""
 
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:48
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:49
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:57
-msgid "Apply"
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup.cpp:57
-msgid "Reset Windows"
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Video"
+#: src/gui/setup_joystick.cpp:41
+msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:77
-msgid "Audio"
+#: src/gui/setup_joystick.cpp:81
+msgid "Stop"
 msgstr ""
 
-#: src/gui/setup.cpp:81
-msgid "Joystick"
+#: src/gui/setup_joystick.cpp:82
+msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup.cpp:85
-msgid "Keyboard"
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
-msgid "Press the button to start calibration"
+#: src/gui/setup_keyboard.cpp:92
+msgid "Default"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
-msgid "Calibrate"
+#: src/gui/setup_keyboard.cpp:121
+msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:40
-msgid "Enable joystick"
+#: src/gui/setup_keyboard.cpp:122
+msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:77
-msgid "Stop"
+#: src/gui/setup_players.cpp:55
+#, fuzzy
+msgid "Name"
+msgstr "nom"
+
+#: src/gui/setup_players.cpp:56
+msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:78
-msgid "Rotate the stick"
+#: src/gui/setup_players.cpp:60
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:62
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:63
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:217
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:219
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:221
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:248
+msgid "When ignoring:"
 msgstr ""
 
 #: src/gui/setup_video.cpp:114
@@ -476,99 +702,231 @@ msgstr ""
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:117
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:119
+#: src/gui/setup_video.cpp:118
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:139
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: src/gui/setup_video.cpp:141
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:142
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: src/gui/setup_video.cpp:143
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
+#: src/gui/setup_video.cpp:144
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212
+#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
+#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218
+#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:275
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:296
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:276
+#: src/gui/setup_video.cpp:297
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:287
+#: src/gui/setup_video.cpp:309
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:310
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/trade.cpp:61
-msgid "Add"
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/trade.cpp:63 src/gui/trade.cpp:65 src/gui/trade.cpp:181
-msgid "Propose trade"
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:66 src/gui/trade.cpp:181
-msgid "Confirm trade"
+#: src/gui/skill.cpp:133
+msgid "Up"
 msgstr ""
 
-#: src/gui/trade.cpp:76 src/gui/trade.cpp:118 src/gui/trade.cpp:132
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, c-format
-msgid "You get %d GP."
+msgid "Job: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:77
-msgid "You give:"
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
+#, c-format
+msgid "Money: %d GP"
 msgstr ""
 
-#: src/gui/trade.cpp:80
-msgid "Change"
-msgstr "canvi"
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
 
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
+#: src/gui/status.cpp:59
+msgid "Exp:"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+msgid "Job:"
+msgstr ""
+
+#: src/gui/status.cpp:127
+msgid "Stats"
+msgstr ""
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, no-c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:139
+#, no-c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:141
+#, no-c-format
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:285
+msgid "Strength"
+msgstr ""
+
+#: src/gui/status.cpp:286
+msgid "Agility"
+msgstr ""
+
+#: src/gui/status.cpp:287
+msgid "Vitality"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/gui/status.cpp:288
+msgid "Intelligence"
+msgstr ""
+
+#: src/gui/status.cpp:289
+msgid "Dexterity"
+msgstr ""
+
+#: src/gui/status.cpp:290
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:308
 #, c-format
-msgid "HP %+d"
+msgid "Remaining Status Points: %d"
+msgstr ""
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209
 #, c-format
-msgid "MP %+d"
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr ""
+
+#: src/gui/trade.cpp:290
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:526
+msgid "Completed"
+msgstr ""
+
+#: src/main.cpp:778
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:965
+msgid "Connecting to map server..."
+msgstr ""
+
+#: src/main.cpp:973
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:981
+msgid "Connecting to account server..."
+msgstr ""
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Change"
+#~ msgstr "canvi"