Updated the po files so that they shouldn't generate errors for us any

more, as well as a few more code style fixes.

Signed-off-by: Ira Rice <irarice@gmail.com>

25 files changed, 23727 insertions, 6519 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1816a886..5f244d22 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,6 +8,9 @@ src/gui/chat.cpp
 src/gui/colour.cpp
 src/gui/confirm_dialog.cpp
 src/gui/connection.cpp
+src/gui/emotecontainer.cpp
+src/gui/emoteshortcutcontainer.cpp
+src/gui/emotewindow.cpp
 src/gui/equipmentwindow.cpp
 src/gui/help.cpp
 src/gui/inventorywindow.cpp
@@ -29,9 +32,6 @@ src/gui/setup_keyboard.cpp
 src/gui/setup_players.cpp
 src/gui/setup_video.cpp
 src/gui/skill.cpp
-src/gui/smileycontainer.cpp
-src/gui/smileyshortcutcontainer.cpp
-src/gui/smileywindow.cpp
 src/gui/speechbubble.cpp
 src/gui/status.cpp
 src/gui/trade.cpp
diff --git a/po/ar.po b/po/ar.po
index 0a19529e..e07e5814 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-07-16 18:28+0000\n"
 "Last-Translator: صقر بن عبدالله <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,898 +17,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "شراء"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "السعر: %d GP / الإجمالي: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "مغادرة"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "الوصف: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "التأثير: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "إيقاف"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "بيع"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "إنتقاء الشخصيّة"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "موافق"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "جديد"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "حذف"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "السّابق"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "التّالي"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "الاسم: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "النقود: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "السّابق"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "التّالي"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "جديد"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "حذف"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "موافق"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "إنشاء شخصيّة"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "الاسم:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "لون الشعر:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "قصّة الشعر:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "إنشاء"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "إنتقاء الشخصيّة"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "إنشاء"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "الخادوم:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "تغيير OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "المنفذ:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "الخادوم:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "نعم"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "لا"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "جارِ الاتّصال..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "استخدام"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "العتاد"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "الجردة"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "استخدام"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "إسقاط"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "الوصف: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "التأثير: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "الاسم:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "التأثير: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "الوصف: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "تجريد من العتاد"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "استعمال العتاد"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "ولوج"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "كلمة السرّ:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "المنفذ:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "ترك"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "تسجيل"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "الحالة"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "مهارات"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "اختصار"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "تثبيت"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "خارطة صغيرة"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "خارطة صغيرة"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@تجارة|متاجرة مع %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@مهاجمة|هاجم %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@محادثة|تحدّث مع NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@إلغاء|إلغاء@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@اقتطاف|اقتطاف %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@استخدام|استخدام العتاد@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@استخدام|استخدام العتاد@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@استخدم|استخدم@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@إسقاط|إسقاط@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@الوصف|الوصف@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "تأكيد:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "يجب أن يكون طول اسم المستخدم على الأقل %d محارف."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "يجب أن يكون طول اسم المستخدم أقل من %d محارف."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "يجب أن تكون طول كلمة السرّ على الأقل %d محارف."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محارف."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "خطأ"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "صوت"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "حجم صوت المؤثرّات"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "حجم صوت الموسيقا"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "تطبيق"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "تصفير النوافذ"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "مرئية"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "سمعيّ"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "عصا الألعاب"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "لون الشعر:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "إضغط على الزرّ لبدأ المعايرة"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "معايرة"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "تفعيل عصا الألعاب"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "إيقاف"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "تدوير العصا"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "حذف"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "الاسم:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "ملء الشاشة"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "مؤشّر مخصّص"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "حدّ FPS:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "عتمة واجهة المستخدم"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "نصف قطر اللفّ"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "كسل اللفّ"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "مؤثّرات محيطة"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "واقف"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "منخفض"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "مرتفع"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "ملء الشاشة"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "جارِ ملء الشاشة"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "تغيير OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "استخدام"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "النقود: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "الحالة"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "مهاجمة %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "دفاع %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "مهاجمة %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "دفاع %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "القوّة:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "خفّة الحركة:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "نشاط:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "ذكاء:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "المهارة:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "إضافة"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "أنت تحصل على %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "أنت تقدّم:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "جارِ الاتّصال..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "جارِ الاتّصال..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "جارِ الاتّصال..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "الاسم: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "جارِ الاتّصال..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -951,9 +1675,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "اختار خادومك لـMana World"
 
-#~ msgid "Port:"
-#~ msgstr "المنفذ:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "رجاء طباعة عنوان ومنفذ الخادوم."
 
@@ -980,6 +1701,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "الوزن الإجماليّ: %d - وزن الحدّ الأقصى: %d"
-
-#~ msgid "Keep"
-#~ msgstr "ترك"
diff --git a/po/ca.po b/po/ca.po
index 7325a252..569fdab4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-07-03 17:21+0000\n"
 "Last-Translator: Habari <thomas.becerril@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -17,885 +17,1587 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "preu %d GP / total %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "sortir"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr ""
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr ""
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr ""
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr ""
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr ""
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr ""
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr ""
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr ""
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr ""
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "nom"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr ""
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr ""
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "canvi"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
+msgstr ""
+
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr ""
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+msgid "Party"
+msgstr ""
+
+#: ../src/gui/colour.cpp:38
+msgid "Server"
+msgstr ""
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "si"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "no"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr ""
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
+#: ../src/gui/inventorywindow.cpp:55
+msgid "Drop"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:57
-msgid "Drop"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+msgid "Description:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+msgid "Effect:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "nom"
+
+#: ../src/gui/inventorywindow.cpp:170
+msgid "Effect: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:172
+msgid "Description: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr ""
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr ""
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr ""
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+msgid "Map"
+msgstr ""
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+msgid "@@attack|Attack "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+msgid "Color:"
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "nom"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+msgid "use"
+msgstr ""
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, c-format
 msgid "Money: %d GP"
 msgstr ""
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 msgid "Stats"
 msgstr ""
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 msgid "Strength"
 msgstr ""
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 msgid "Agility"
 msgstr ""
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 msgid "Vitality"
 msgstr ""
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 msgid "Intelligence"
 msgstr ""
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+msgid "Are you sure you want to quit?"
+msgstr ""
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+msgid "Trying to connect to account server..."
+msgstr ""
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+msgid "Trying to connect to char server..."
+msgstr ""
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+msgid "Trying to connect to map server..."
+msgstr ""
+
+#: ../src/main.cpp:668
+#, c-format
+msgid "Map: %s"
+msgstr ""
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
-
-#~ msgid "Change"
-#~ msgstr "canvi"
diff --git a/po/cs.po b/po/cs.po
index efb03f63..9191a30c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-12-17 16:31+0000\n"
 "Last-Translator: Lubos <alvinx12@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -17,899 +17,1617 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Nákup"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Prodej"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Potvrďte vymazání postavy"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 #, fuzzy
 msgid "Select Character"
 msgstr "Vytvořit postavu"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Nová"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Odstranit"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Předchozí"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Další"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Jméno: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Peníze: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Předchozí"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Další"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Nová"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Odstranit"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Vytvořit postavu"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Barva vlasů:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Styl vlasů:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Vytvořit"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Server:"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Vytvořit"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Ano"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr ""
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Vybavení"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventář"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Upustit"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Popis: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+msgid "Effect:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Jméno:"
+
+#: ../src/gui/inventorywindow.cpp:170
+msgid "Effect: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Popis: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Vybavit"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství zboží, se kterým budete obchodovat."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství zboží, které chcete upustit."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "Zapamatovat uživatelské jméno"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
+
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registrace"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Stav"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Dovednosti"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Zkratka"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "MiniMapa"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+msgid "@@attack|Attack "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Muž"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Žena"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Uživatelské jméno musí být nejméně %d znaků dlouhé."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Uživatelské jméno musí být kratší než %d znaků."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Heslo musí být kratší než %d znaků."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Chyba"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "Klávesnice"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Barva vlasů:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Kalibrovat"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Odstranit"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Jméno:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+msgid "Restart your client or change maps for the change to take effect."
+msgstr ""
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+msgid "use"
+msgstr ""
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Peníze: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Stav"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Útok %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Obrana %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Útok %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Obrana %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Síla:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Vitalita:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalita:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligence:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Připojuji se..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Připojuji se..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Připojuji se..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Jméno: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Připojuji se..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "Zapamatovat uživatelské jméno"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Správa účtu a postavy"
 
@@ -943,9 +1661,6 @@ msgstr ""
 #~ msgid "Email:"
 #~ msgstr "E-mail:"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Propose trade"
 #~ msgstr "Nabídnout obchod"
 
diff --git a/po/da.po b/po/da.po
index dae66aca..99f118ef 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -17,901 +17,1628 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Køb"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Stop"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Sælg"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Er du sikker på at du vil slette denne figur?"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne figur?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Vælg Bruger"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "O.k."
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Opret"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Slet"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Forrige"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Næste"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Navn; %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Penge: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Forrige"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Næste"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Opret"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Slet"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "O.k."
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Lav figur."
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Navn:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Hårfarve:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Frisure:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Opret"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Vælg Bruger"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Opret"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Skrifter til OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Opretter forbindelse..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Brug"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Udstyr"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventarliste"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Brug"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Smid"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Beskrivelse: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effekt: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Navn:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effekt: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Beskrivelse: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Tag af"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Tag på"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Vælge hvor mange du vil bytte."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Vælg hvor mange du vil smide,"
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Log Ind"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "Husk dette brugernavn."
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Behold"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registrer"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Færdigheder"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Genvej"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Opsætning"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "MiniKort"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "MiniKort"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Byt Med %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Angrib %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Snak med NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuller@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Saml Op %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Tag på@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Tag på@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Brug@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Smid@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Beskrivelse@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Bekræft:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Mand"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Kvinde"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Brugernavnet skal mindst være %d bogstaver langt."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Brugernavnet skal være mindre end %d bogstaver langt."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Adgangskoden skal mindst være %d bogstaver langt."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Adgangskoder stemmer ikke overens."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Fejl"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Lyd"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Lydstyrke på effekter"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Lydstyrke på musik"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Anvend"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Nulstil vinduer"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Lyd"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Hårfarve:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Tryk på knappen for at starte justeringen."
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Justering"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Aktiver joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Stop"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Roter joystick"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Slet"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Navn:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Fuld Skærm"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Brugerdefineret Musepil"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "FPS grænse:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Gennemsigtighed"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Følsomhed på mus"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Acceleration på mus"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Omgivende FX"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "fra"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "lav"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "høj"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Fuld Skærm"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Skifter til fuld skærm"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Skrifter til OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Ændringerne kræver at du genstarter klienten."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Ændringerne kræver at du genstarter klienten."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Brug"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Penge: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Angrib %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Forsvar %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Angrib %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Forsvar %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Styrke"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Adræthed"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Helbred:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligens:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Behændighed:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Du får %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Du giver:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Er du sikker på at du vil slette denne figur?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Opretter forbindelse..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Opretter forbindelse..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Opretter forbindelse..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Navn; %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Opretter forbindelse..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "Husk dette brugernavn."
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Ret konto og figurer"
 
@@ -972,9 +1699,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Vælg din Mana World Server"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Skriv både adressen og porten på serveren."
 
@@ -1004,6 +1728,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Total Vægt: %d - Maximum Vægt: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Behold"
diff --git a/po/de.po b/po/de.po
index 6e71b451..bd230744 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-10-13 00:25+0000\n"
 "Last-Translator: Aeneas Jaißle <Unknown>\n"
 "Language-Team: German\n"
@@ -17,903 +17,1630 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kaufen"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preis: %d GP / Summe: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Stopp"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Verkaufen"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Bestätige Charakter-Löschung"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Spielfigur auswählen"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Neu"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Löschen"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Zurück"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Weiter"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Zurück"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Weiter"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Neu"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Charakter erstellen"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Name :"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Haarfarbe"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Frisur"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Erstellen"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Spielfigur auswählen"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Erstellen"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Ändere OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Nein"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Benutzen"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventar"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Benutzen"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Beschreibung: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effekt: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Name :"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effekt: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Beschreibung: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Ablegen"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Wähle aus, wieviele Gegenstände Du tauschen möchtest."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Wähle aus, wieviele Gegenstände Du wegwerfen möchtest."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "Benutzernamen merken"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Erinnern"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Fertigkeiten"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Tastenkürzel"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Übersichtskarte"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Übersichtskarte"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Mit %s handeln@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|%s angreifen@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Mit NSC reden@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Abbrechen@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|%s aufheben@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Ausrüsten@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Ausrüsten@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Nutzen@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Fallen lassen@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Beschreibung@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Männlich"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Weiblich"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Der Nutzername muss aus mindestens %d Zeichen bestehen."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Der Nutzername muss kürzer als %d Zeichen sein."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Das Passwort muss aus mindestens %d bestehen."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Fehler"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Ton"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Lautstärke der Klangeffekte"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Latustärke der Musik"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Anwenden"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Haarfarbe"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Kalibrieren"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Joystick aktivieren"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Kreise den Steuerknüppel"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Löschen"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Name :"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Benutzerdefinierten Zeiger"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "FPS-Limit:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "GUI Transparenz"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Scroll-Radius"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Scroll-Trägheit"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "Aus"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "Niedrig"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "Hoch"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Vollbild"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Wechsle zum Vollbildmodus"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Ändere OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Benutzen"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Geld: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Angriff %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Verteidigung %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Angriff %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Verteidigung %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Stärke:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agilität:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalität:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligenz:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Geschicklichkeit:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Du erhälst %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Du gibst:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Verbinde..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Verbinde..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Verbinde..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Name : %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Verbinde..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "Benutzernamen merken"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Account- und Charakterverwaltung"
 
@@ -974,9 +1701,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Wähle Deinen Mana World Spielserver"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Bitte die Adresse und den Port eines Servers eingeben"
 
@@ -1006,6 +1730,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Gesamtgewicht : %d - Maximales Gewicht : %d"
-
-#~ msgid "Keep"
-#~ msgstr "Erinnern"
diff --git a/po/en_GB.po b/po/en_GB.po
index 80a6ef41..4d10d394 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-05-10 16:51+0000\n"
 "Last-Translator: Me <Glich.Glich@googlemail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -17,898 +17,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Buy"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Price: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Exit"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effect: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Stop"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Sell"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Are you sure you want to delete this character?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Select Character"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "New"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Delete"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Previous"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Next"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Money: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Previous"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Next"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "New"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Delete"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Create Character"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Name:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Hair Colour:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Hair Style:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Create"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Select Character"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Create"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Changing OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Yes"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Connecting..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Use"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipment"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventory"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Use"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Drop"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Description: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effect: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Name:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effect: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Description: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Unequip"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Equip"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Select amount of items to trade."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Select amount of items to drop."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Keep"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Register"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Skills"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Shortcut"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Setup"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "MiniMap"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "MiniMap"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Trade With %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Attack %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Talk To NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancel@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Pick Up %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equip@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Equip@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Drop@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Description@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Confirm:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "The username needs to be at least %d characters long."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "The username needs to be less than %d characters long."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "The password needs to be at least %d characters long."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "The password needs to be less than %d characters long."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Error"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Sound"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Sfx volume"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Music volume"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Reset Windows"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Hair Colour:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Press the button to start calibration"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Calibrate"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Enable joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Stop"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Rotate the stick"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Delete"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Name:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Full screen"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Custom cursor"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Gui opacity"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Scroll radius"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Scroll laziness"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Ambient FX"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "off"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "low"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "high"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Full screen"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Switching to full screen"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Changing OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Restart needed for changes to take effect."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Restart needed for changes to take effect."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Use"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Level: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Money: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Attack %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Defense %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Attack %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Defense %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Strength:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agility:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitality:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligence:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dexterity:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Add"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "You get %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "You give:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Are you sure you want to delete this character?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Connecting..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Connecting..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Connecting..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Name: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connecting..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -951,9 +1675,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Choose your Mana World Server"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Please type both the address and the port of a server."
 
@@ -980,6 +1701,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Total Weight: %d - Maximum Weight: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Keep"
diff --git a/po/eo.po b/po/eo.po
index 928b0fbf..0692acc3 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-11-10 22:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -17,881 +17,1584 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr ""
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:86
-msgid "New"
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
+#, c-format
+msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
+#, c-format
+msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:88
-msgid "Previous"
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#, c-format
+msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:89
-msgid "Next"
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
 msgstr ""
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
-#, c-format
-msgid "Name: %s"
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
-#, c-format
-msgid "Level: %d"
+#: ../src/gui/char_select.cpp:93
+msgid "New"
 msgstr ""
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
-#, c-format
-msgid "Job Level: %d"
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
-#, c-format
-msgid "Money: %d"
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
 msgstr ""
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr ""
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr ""
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr ""
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
+msgstr ""
+
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr ""
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+msgid "Party"
+msgstr ""
+
+#: ../src/gui/colour.cpp:38
+msgid "Server"
+msgstr ""
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr ""
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr ""
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
+#: ../src/gui/inventorywindow.cpp:55
+msgid "Drop"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:57
-msgid "Drop"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+msgid "Description:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+msgid "Effect:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+msgid "Name: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:170
+msgid "Effect: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:172
+msgid "Description: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr ""
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr ""
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr ""
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+msgid "Map"
+msgstr ""
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+msgid "@@attack|Attack "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+msgid "Color:"
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+msgid "use"
+msgstr ""
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, c-format
 msgid "Money: %d GP"
 msgstr ""
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 msgid "Stats"
 msgstr ""
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 msgid "Strength"
 msgstr ""
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 msgid "Agility"
 msgstr ""
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 msgid "Vitality"
 msgstr ""
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 msgid "Intelligence"
 msgstr ""
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+msgid "Are you sure you want to quit?"
+msgstr ""
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+msgid "Trying to connect to account server..."
+msgstr ""
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+msgid "Trying to connect to char server..."
+msgstr ""
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+msgid "Trying to connect to map server..."
+msgstr ""
+
+#: ../src/main.cpp:668
+#, c-format
+msgid "Map: %s"
+msgstr ""
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
diff --git a/po/es.po b/po/es.po
index f4f67a3f..442a5e8e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-10-15 01:37+0000\n"
 "Last-Translator: catalania <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -17,898 +17,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Precio: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Salir"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efecto: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Detener"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Vender"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "¿Seguro que quieres borrar este personaje?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Seleccionar personaje"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Aceptar"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Nuevo"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Eliminar"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Anterior"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Siguiente"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Dinero: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Siguiente"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Nuevo"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Aceptar"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Crear Personaje"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Color de pelo:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "corte de pelo"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Crear"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Seleccionar personaje"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Crear"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Cambiar a OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Puerto:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Servidor:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Sí"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Conectando…"
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Usar"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipo"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Usar"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "tirar"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Descripción: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Efecto: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Nombre:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Efecto: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Descripción: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "quitarselo"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Seleccione objetos para comerciar."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Seleccione objetos para soltar."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "conectarse"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Puerto:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Mantener"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Habilidades"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Atajos"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Minimapa"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Minimapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Comerciar con %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Atacar a %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Hablar al NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Recoger %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equipar@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipar@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Tirar@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Descripción@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "El nombre de usuario debe tener al menos %d caracteres."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "El nombre de usuario puede tener como máximo %d caracteres."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "La contraseña debe tener al menos %d caracteres."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "La contraseña puede tener como máximo %d caracteres."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Error"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volumen efectos"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Volumen musica"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Reiniciar ventanas"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Color de pelo:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Presione el botón para comenzar la calibración"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Activar joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Detener"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Gire el stick"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Eliminar"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Nombre:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Cursor propio"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Límite de FPS:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Transparencia menus"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Ratio de scroll"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Velocidad de scroll"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Efectos ambientales"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "desactivado"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "bajo"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "alto"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Pantalla completa"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Cambiar a pantalla completa"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Se necesita reiniciar para aplicar los cambios."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Cambiar a OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Se necesita reiniciar para aplicar los cambios."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Se necesita reiniciar para aplicar los cambios."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Usar"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Dinero: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Estado"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Ataque %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Defensa %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Ataque %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Defensa %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Fuerza:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agilidad:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalidad:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligencia:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Destreza:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Añadir"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Tu consigues %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Tu das:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "¿Seguro que quieres borrar este personaje?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Conectando…"
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Conectando…"
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Conectando…"
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nombre: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando…"
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -951,9 +1675,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Elija su servidor de Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Puerto:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Escriba la dirección y el puerto de un servidor."
 
@@ -980,6 +1701,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Peso Total: %d - Peso Máximo: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Mantener"
diff --git a/po/fi.po b/po/fi.po
index 80b21093..f7aef242 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-12-30 10:23+0000\n"
 "Last-Translator: ville-v <villev90@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -17,902 +17,1629 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Osta"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Kappalehinta: %d GP / Yhteensä: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Sulje"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Kuvaus: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Vaikutus: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Lopeta"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Myy"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Peru"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Vahvista hahmon poistopyyntö"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 #, fuzzy
 msgid "Select Character"
 msgstr "Luo hahmo"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Uusi"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Poista"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Edellinen"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Seuraava"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nimi: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Rahatilanne: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Edellinen"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Seuraava"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Uusi"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Poista"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Luo hahmo"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Hiusten väri:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Hiustyyli:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Luo"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Vaihda palvelinta"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Luo"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Vaihdetaan OpenGL -toimintatilaan"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Portti:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Palvelin:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Ei"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Käytä"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Tavaraluettelo"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Käytä"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Pudota"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Kuvaus: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Vaikutus: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Nimi:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Vaikutus: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Kuvaus: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Ota käyttöön"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Anna vaihdettavien tavaroiden määrä."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "Muista käyttäjätunnus"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Portti:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr ""
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Hahmon tiedot"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Taidot"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Pikavalinnat"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Apukartta"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Apukartta"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "Epäpelattava hahmo"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Vaihda tavaroita %s kanssa@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Hyökkää %s kimppuun@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Puhu epäpelattavalle hahmolle@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Peruuta@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Poimi %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Ota varuste käyttöön@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Ota varuste käyttöön@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Käytä@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Pudota maahan@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Kuvaus@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Vahvista:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Miespuolinen"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Naispuolinen"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä"
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Virhe"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Ääni"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Äänitehosteiden voimakkuus"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Musiikin voimakkuus"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Käytä"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Kuva"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Ääni"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Peliohjain"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "Näppäimistö"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Hiusten väri:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Kalibroi"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Peliohjaintuki päälle"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Lopeta"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Käytä ohjain ääriasennoissaan pyörittämällä"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Poista"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Nimi:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Kokoruututila"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Käyttöliittymän läpinäkyvyys"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Kameran perässälaahaus"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Kameran perässälaahauksen tiukkuus"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Taustaäänet"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "pois päältä"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "matala"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "korkea"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Kokoruututila"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Kokoruututilaan siirtyminen"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Vaihdetaan OpenGL -toimintatilaan"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Käytä"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Taso: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Rahatilanne: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Hahmon tiedot"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Hyökkäys %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Puolustus %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Hyökkäys %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Puolustus %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Voima:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Ketteryys:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Elinvoima:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Älykkyys:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Näppäryys:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Sait %d GP"
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Annat:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Yhdistetään..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Yhdistetään..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Yhdistetään..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nimi: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Yhdistetään..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "Muista käyttäjätunnus"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Tilin ja hahmojen hallinta"
 
@@ -970,9 +1697,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Valitse Mana World -palvelimesi"
 
-#~ msgid "Port:"
-#~ msgstr "Portti:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
 
diff --git a/po/fr.po b/po/fr.po
index 3d8a121c..4e365259 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-12-26 10:43+0000\n"
 "Last-Translator: Johan Serre <Unknown>\n"
 "Language-Team: French\n"
@@ -18,903 +18,1632 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Acheter"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prix : %d PO / Total : %d PO"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effet : %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Stop"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Vendre"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Confirmer la suppression du personnage"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Choix du personnage"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Nouveau"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Supprimer"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Précédent"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Suivant"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Argent : %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Précédent"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Suivant"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Nouveau"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Création du personnage"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Couleur des cheveux"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Coiffure :"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Créer"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Choix du personnage"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Créer"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Serveur :"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Changement OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port :"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Serveur :"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Oui"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Non"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Utiliser"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Équipement"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaire"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Utiliser"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Lâcher"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Description : %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effet : %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Nom :"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effet : %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Description : %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Retirer"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Équiper"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Choisissez le nombre d'objets à troquer."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Choisissez le nombre d'objets à lâcher."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Connexion"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "Se souvenir du nom d'utilisateur"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port :"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Conserver"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "S'inscrire"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Statut"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Compétences"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Raccourci"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Plan"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Plan"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "PNJ"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Troquer avec %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Attaquer %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Parler au PNJ@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuler@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Ramasser %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Équiper@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Équiper@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Utiliser@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Lâcher@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Description@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Vérification :"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Masculin"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Féminin"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Le nom d'utilisateur doit faire au moins %d caractères."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Le nom d'utilisateur doit faire moins de %d caractères."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Le mot de passe doit faire au moins %d caractères."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Le mot de passe doit faire moins de %d caractères."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe ne correspondent pas."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Erreur"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Son"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volume des effets sonores"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Volume de la musique"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "Clavier"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Couleur des cheveux"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Calibrer"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Activer le joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Stop"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Tourner le joystick"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Supprimer"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Nom :"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Plein écran"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Limite FPS :"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Opacité de l'interface"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Rayon du scrolling"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Paresse du scrolling"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Effets ambiants"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "aucun"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "léger"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "complet"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Plein écran"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Passage en plein écran"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Changement OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr ""
+"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
+"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Utiliser"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Argent : %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Statut"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Attaque %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Défense %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Attaque %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Défense %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Force :"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agilité :"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalité :"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligence :"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dextérité :"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Vous obtenez %d PO."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Vous donnez :"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Connexion..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Connexion..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Connexion..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nom : %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connexion..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "Se souvenir du nom d'utilisateur"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Gestion du compte et du personnage"
 
@@ -975,9 +1704,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Choisissez votre serveur The Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Port :"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Veuillez entrer l'adresse et le port du serveur."
 
@@ -1007,6 +1733,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Poids total : %d - Poids maximal : %d"
-
-#~ msgid "Keep"
-#~ msgstr "Conserver"
diff --git a/po/he.po b/po/he.po
index 87766812..9b622a04 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-10-20 00:23+0000\n"
 "Last-Translator: Ddorda <d.dorda@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -17,902 +17,1629 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "קנה"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "מחיר: %d זהב / סה\"כ %d זהב"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "יציאה"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "תיאור: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "השפעה: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "עצור"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "מכר"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "ביטול"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "אשר מחיקת שחקן"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 #, fuzzy
 msgid "Select Character"
 msgstr "צור שחקן"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "אישור"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "חדש"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "מחק"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "הקודם"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "הבא"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "שם: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "רמה: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "זהב: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "הקודם"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "הבא"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "חדש"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "מחק"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "אישור"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "צור שחקן"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "שם:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "צבע שיער:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "תיספורת:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "צור"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "החלף שרת"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "צור"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "שרת:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "משנה OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "פורט:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "שרת:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "כן"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "לא"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "מתחבר..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "השתמש"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "ציוד"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "ציוד"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "השתמש"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "השלך"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "תיאור: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "השפעה: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "שם:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "השפעה: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "תיאור: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "הורד"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "החזק"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "בחר כמות חפצים לסחור."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "בחר כמות חפצים להשליך."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "התחברות"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "זכור שם משתמש"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "פורט:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr ""
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "הרשם"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "מצב"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "כישורים"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "קיצור-דרך"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "הגדרות"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "מיני-מפה"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "מיני-מפה"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|סחור עם %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|תקוף את %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|דבר אל NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|ביטול@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|הרם %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|החזק@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|החזק@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|השלך@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|תיאור@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "אשר:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "זכר"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "נקבה"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "שם המשתמש חייב להכיל לפחות %d תוים."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "שם המשתמש חייב להכיל פחות מ-%d תוים."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "הסיסמה חייבת להכיל לפחות %d תוים."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "צליל"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "עוצמת SFX"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "עוצמת מוזיקה"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "אשר"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "אתחל חלונות"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "וידאו"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "שמע"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "ג'ויסטיק"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "מקלדת"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "צבע שיער:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "לחץ על הכפתור בכדי להתחיל בכיול"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "כייל"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "אפשר ג'ויסטיק"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "עצור"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "סובב את המקל"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "מחק"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "שם:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "מסך מלא"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "‏OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "סמן-עכבר מותאם"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "הגבלת FPS:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "אטימות Gui"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "תווך גלילה"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "עצלנות גלילה"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "אופף FX"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "כבוי"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "נמוך"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "גבוה"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "מסך מלא"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "מחליף למסך מלא"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "משנה OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "אישור שינויים עבור OpenGL דורש איתחול."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "השתמש"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "רמה: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "זהב: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "מצב"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "התקפה %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "הגנה %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "התקפה %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "הגנה %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "עוצמה:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "זריזות:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "חיוניות:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "תבונה:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "מיומנות:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "הוסף"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "אתה מקבל %d זהב."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "אתה נותן:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "מתחבר..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "מתחבר..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "מתחבר..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "שם: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "מתחבר..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "זכור שם משתמש"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "ניהול משתמש ושחקן"
 
@@ -970,9 +1697,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "בחר את שרת ה-Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "פורט:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "אנא הכנס גם את כתובת וגם את פורט השרת."
 
diff --git a/po/hr.po b/po/hr.po
index cef7cc6f..fb7f13e7 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-12-28 23:36+0000\n"
 "Last-Translator: Dino Paskvan <dpaskvan@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -17,896 +17,1615 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kupi"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cijena: %d zlatnika / Ukupno: %d zlatnika"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Izlaz"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Učinak: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Poništi"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Potvrdi Brisanje Lika"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 #, fuzzy
 msgid "Select Character"
 msgstr "Stvori Lika"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "U redu"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Novi"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Obriši"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Prethodni"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Slijedeći"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Ime: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Novac: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Prethodni"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Slijedeći"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Novi"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Obriši"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "U redu"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Stvori Lika"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Boja kose:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Frizura:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Stvori"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Stvori"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr ""
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+msgid "Party"
+msgstr ""
+
+#: ../src/gui/colour.cpp:38
+msgid "Server"
+msgstr ""
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Da"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Spajanje..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Upotrijebi"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Oprema"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Zalihe"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Upotrijebi"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Ispusti"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Opis: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Učinak: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Ime:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Učinak: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Opis: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Skini opremu"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Opremi"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Odaberi količinu predmeta za razmjenu."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Odaberi količinu predmeta za ispuštanje."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Lozinka"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "Zapamti korisničko ime"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr ""
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
+
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registriraj se"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Stanje"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Vještine"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Kratica"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Karta"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Karta"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+msgid "@@attack|Attack "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "Skini opremu"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Muško"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Žensko"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Greška"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Boja kose:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Obriši"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Ime:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+msgid "Restart your client or change maps for the change to take effect."
+msgstr ""
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Upotrijebi"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Novac: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Stanje"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Snaga:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Okretnost:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalnost:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligencija:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Spretnost:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Da li ste sigurni da želite obrisati ovog lika?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Spajanje..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Spajanje..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Spajanje..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Ime: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Spajanje..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "Zapamti korisničko ime"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Upravljanje Računom i Likovima"
 
diff --git a/po/id.po b/po/id.po
index 6f2dda71..1d6a8530 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-03-26 09:11+0000\n"
 "Last-Translator: ActiveFile <activefile@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -17,898 +17,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Beli"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Harga: %d GP / Jumlah: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Deskripsi: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efek: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Berhenti"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Jual"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Pilih Karakter"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Buat baru"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Hapus"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Sebelumnya"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Berikutnya"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nama: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Uang: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Sebelumnya"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Berikutnya"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Buat baru"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Hapus"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Buat Karakter"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Nama:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Warna Rambut:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Gaya Rambut:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Buat"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Pilih Karakter"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Buat"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Mengubah OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Ya"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Tidak"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Gunakan"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Perlengkapan"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Gunakan"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Jatuh"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Deskripsi: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Efek: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Nama:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Efek: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Deskripsi: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan"
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang mau di buang"
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Kata Sandi:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Pertahankan"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Mendaftar"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Keahlian"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Tombol Singkat"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Atur"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "MiniMap"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "MiniMap"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Dagang Dengan %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Serang%s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Bicara dengan NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Batal@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Ambil %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Melengkapi@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Melengkapi@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Gunakan@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Buang@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Deskripsi@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Konfirmasi:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Panjang username setidak-tidaknya %d karakter"
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Panjang kata-sandi setidak-tidaknya %d karakter"
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Kata sandi tidak sama."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Suara"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volume sfx"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Volume Musik"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Terapkan"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Suara"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Warna Rambut:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Tekan tombol untuk memulai kalibrasi"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Kalibrasi"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Membolehkan joistik"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Berhenti"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Memutar tongkat"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Hapus"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Nama:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Batas FPS"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Radius gulungan"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "mati"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "rendah"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "tinggi"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Layar penuh"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Mengganti ke layar penuh"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Mengubah OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Memulai dari awal di butuhkan untuk melihat efek"
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Memulai dari awal di butuhkan untuk melihat efek"
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Gunakan"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Uang: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Serangan %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Pertahanan %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Serangan %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Pertahanan %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Kekuatan"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Kecerdasan"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Ketangkasan"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Tambah"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Anda mendapatkan %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Anda memberikan:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Menyambung..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Menyambung..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Menyambung..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nama: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Menyambung..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -951,9 +1675,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Pilih Server Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Tolong tulis address dan port dari server"
 
@@ -980,6 +1701,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Jumlah Berat: %d - Berat Maksimum: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Pertahankan"
diff --git a/po/it.po b/po/it.po
index a86caec2..b1bf327c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2007-12-03 01:45+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Italian\n"
@@ -19,898 +19,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Compra"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prezzo: %d GP / Totale: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Esci"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrizione : %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effetto : %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Ferma"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Vendi"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Cancella"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Sei sicuro di voler cancellare questo personaggio?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Scelta Personaggio"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Nuovo"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Elimina"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Precedente"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Prossimo"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nome : %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Livello: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Monete: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Precedente"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Prossimo"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Nuovo"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Elimina"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Crea Personaggio"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Nome :"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Colore Capelli"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Stile Capelli:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Create"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Scelta Personaggio"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Create"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Modifica OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Porta:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Si"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Connessione..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Usa"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Usa"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Lascia"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Descrizione : %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effetto : %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Nome :"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effetto : %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Descrizione : %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Rimuovi"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Equipaggia"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Autenticazione"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Porta:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Mantieni"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registra"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Stato"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Abilità"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Scorciatoia"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Mini mappa"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Mini mappa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Scambia Con %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Attacca %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Parla con NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancella@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Raccogli %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equipaggia@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipaggia@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@usa|Usa@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Lascia@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Descrizione@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Conferma:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Il nome utente deve contenere almeno %d caratteri."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Il nome utente deve avere meno di %d caratteri."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "La password deve essere lunga almeno %d caratteri."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "La password deve contenere meno di %d caratteri."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Errore"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Suono"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volume effetti sonori"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Volume musica"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Applica"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Resetta finestre"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Colore Capelli"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Premi il pulsante per cominciare la calibrazione"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Calibra"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Abilita joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Ferma"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Ruota la manopola"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Elimina"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Nome :"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Schermo intero"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Cursore personalizzato"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Limita FPS:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Opacità IU"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Raggio dello scroll"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Lentezza dello scroll"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Suoni ambientali"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "Spento"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "Basso"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "Alto"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Schermo intero"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Modalità a schermo intero"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Modifica OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Usa"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Livello: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Monete: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Stato"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Attacco %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Difesa %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Attacco %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Difesa %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Forza:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agilità:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalità:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligenza:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Destrezza:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Ottieni %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Dai:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Sei sicuro di voler cancellare questo personaggio?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Connessione..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Connessione..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Connessione..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nome : %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connessione..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -953,9 +1677,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Scegli il tuo server Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Porta:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Per favore inserisci l'indirizzo e la porta del server."
 
@@ -982,6 +1703,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Peso totale : %d - Peso massimo : %d"
-
-#~ msgid "Keep"
-#~ msgstr "Mantieni"
diff --git a/po/ja.po b/po/ja.po
index bd629cd2..f82bdaef 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-06-28 16:27+0000\n"
 "Last-Translator: fate <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -17,893 +17,1611 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "買う"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "価格: %d GP / 合計: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "終了"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "名状: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "効用: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "このキャラは消してもいいですか?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "キャラを選択"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "了解"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "新規"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "削除"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "前へ"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "次へ"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "GP: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "前へ"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "次へ"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "新規"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "削除"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "了解"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "キャラを作成"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "名前:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "髪の色："
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "髪型："
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "作成"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "キャラを選択"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "作成"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "サーバ:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "ポート:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "サーバ:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "はい"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "いいえ"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "接続しています..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "使う"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "使う"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "名状: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "効用: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "名前:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "効用: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "名状: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "ログイン"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "ポート:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
+
+#: ../src/gui/login.cpp:75
+msgid "Keep"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "状態"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "セットアップ"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+msgid "Map"
+msgstr ""
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|%sを攻撃する@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|NPCを喋る@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|使う@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|使う@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "パスワードが一致していません。"
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "エラー"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "音声"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "髪の色："
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "削除"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "名前:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+msgid "Restart your client or change maps for the change to take effect."
+msgstr ""
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "使う"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "レベル: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "GP: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "状態"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "筋力:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "素早さ:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "体力:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "知性:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "敏捷:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "このキャラは消してもいいですか?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "接続しています..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "接続しています..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "接続しています..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "名前: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "接続しています..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -922,9 +1640,6 @@ msgstr ""
 #~ msgid "Email:"
 #~ msgstr "Eメール："
 
-#~ msgid "Port:"
-#~ msgstr "ポート:"
-
 #~ msgid "Confirm"
 #~ msgstr "確認"
 
diff --git a/po/nl.po b/po/nl.po
index c2700ada..ed33a824 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-10-10 00:04+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
@@ -17,894 +17,1618 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kopen"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effect: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Stoppen"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Kies Personage"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Oké"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Nieuw"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Vorige"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Volgende"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Vorige"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Volgende"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Nieuw"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Oké"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Personage Aanmaken"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Haarkleur:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Haarstijl:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Aanmaken"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Kies Personage"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Aanmaken"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Veranderen van OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Poort:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Nee"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Gebruiken"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Gebruiken"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Neerleggen"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Beschrijving: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effect: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Naam:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effect: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Beschrijving: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Afdoen"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal exemplaren om neer te leggen"
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Wachtword:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Poort:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Behouden"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Aanmelden"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Vaardigheden"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Kaartje"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Kaartje"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Handelen met %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|%s aanvallen@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Praat met NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuleren@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|%s oppakken@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Uitrusten@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Uitrusten@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Gebruiken@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Neerleggen@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Beschrijving@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Bevestigen:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Fout"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Geluid"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volume van geluiden"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Muziek volume"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Haarkleur:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Kalibreren"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Joystick activeren"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Stoppen"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Maak rondjes met de stick"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Verwijderen"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Naam:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "FPS limiet:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Scroll radius"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Scroll vertraging"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "uit"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "laag"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "hoog"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Volledig scherm"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Overgaan naar volledig scherm"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Veranderen van OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "De veranderingen worden pas actief na opnieuw opstarten"
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "De veranderingen worden pas actief na opnieuw opstarten"
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Gebruiken"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Level: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Geld: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Sterkte:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agiliteit:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitaliteit:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligentie:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dexteriteit:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Je geeft:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Verbinden..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Verbinden..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Verbinden..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Naam: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Verbinden..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -941,9 +1665,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Kies uw Mana World server"
 
-#~ msgid "Port:"
-#~ msgstr "Poort:"
-
 #~ msgid "Confirm"
 #~ msgstr "Bevestigen"
 
@@ -952,6 +1673,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Totaal gewicht: %d - Maximum gewicht: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Behouden"
diff --git a/po/pl.po b/po/pl.po
index 46cee40e..84f5e412 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-10-10 05:26+0000\n"
 "Last-Translator: Michał Trzebiatowski <Unknown>\n"
 "Language-Team: <pl@li.org>\n"
@@ -19,899 +19,1623 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kup"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Razem: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efekt: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Zatrzymaj"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Sprzedaj"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Wybierz postać"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Nowa"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Usuń"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Poprzedni"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Następny"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Imię: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Pieniądze: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Poprzedni"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Następny"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Nowa"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Usuń"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Stwórz postać"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Imię:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Kolor włosów:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Fryzura:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Stwórz"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Wybierz postać"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Stwórz"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Serwer:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Zmień ustawienia OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Serwer:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Tak"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Nie"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Użyj"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Ekwipunek"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inwentarz"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Użyj"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Upuść"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Opis: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Efekt: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Imię:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Efekt: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Opis: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Zdejmij"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Załóż"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do wymiany."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Użytkownik"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Zachowaj"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Rejestruj"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Stan"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Zdolności"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Skrót"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "MiniMapa"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Targ z %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Atakuj %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Rozmawiaj z NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Anuluj@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Podnieś %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Załóż@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Załóż@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Użyj@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Upuść@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Opis@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Potwierdź:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Mężczyzna"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Kobieta"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Hasło musi mieć conajmniej %d znaków."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Hasło nie może mieć więcej jak %d znaków."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Błąd"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Głośność efektów dźwiękowych"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Głośność muzyki"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Obraz"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Dźwięk"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Kolor włosów:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Wciśnij przycisk aby rozpocząć kalibrację"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Kalibruj"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Włącz joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Obróć drążek"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Usuń"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Imię:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Pełen ekran"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Własny kursor"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Limit FPS:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Przezroczystość GUI"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Skok przy przewijaniu ekranu"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Opóźnienie przy przewijaniu ekranu"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Dźwięki otoczenia"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "wyłączone"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "niskie"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "wysokie"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Pełen ekran"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Przełączanie na pełen ekran"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Zmień ustawienia OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Zastosowywanie zmian w konfiguracji OpenGL wymaga ponownego uruchomienia."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Użyj"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Pieniądze: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Stan"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Atak %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Obrona %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Atak %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Obrona %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Siła:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Zwinność:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Witalność:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligencja:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Zręczność:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Otrzymujesz %d GP"
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Dajesz:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Łączenie..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Łączenie..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Łączenie..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Imię: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Łączenie..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -957,9 +1681,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Wybierz serwer Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Proszę wpisać adres i port serwera"
 
@@ -986,6 +1707,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Całkowita waga: %d - Maksymalna waga: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Zachowaj"
diff --git a/po/pt.po b/po/pt.po
index bd9630d1..09f31b9b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-02-03 10:14+0000\n"
 "Last-Translator: Tiago Silva <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -17,906 +17,1630 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efeito: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Parar"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Vender"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem a certeza que quer apagar este personagem"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Seleccione um Personagem"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Novo"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Eliminar"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Anterior"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Seguinte"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Seguinte"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Novo"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Cor de Cabelo:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Criar"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Seleccione um Personagem"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Criar"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Mudando OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Porta:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Servidor:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Sim"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Não"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Usar"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventário"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Usar"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Largar"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Descrição: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Efeito: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Nome:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Efeito: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Descrição: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Seleccionar a quantidade de itens a negociar."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Seleccionar a quantidade de itens a largar."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Autenticar"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Porta:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Manter"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registo"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Competências"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Configuração"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "MiniMapa"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Negociar com %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Atacar %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Falar com o NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Apanhar %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equipar@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipar@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Largar@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@descrição|Descrição@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "O nome de utilizador necessita de pelo menos %d caracteres."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "O nome de utilizador só pode ter %d caracteres."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "A password necessita de pelo menos %d caracteres."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "A password só pode ter até %d caracteres."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "As senhas não coincidem."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Erro"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Som"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volume dos Efeitos"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Volume da Música"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Reiniciar Janelas"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Cor de Cabelo:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Pressione o botão para começar a calibragem"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Habilitar Joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Parar"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Rode o manipulo"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Eliminar"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Nome:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Ecrã completo"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Cursor personalizado"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Limite de FPS:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Opacidade do Interface"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Efeitos Ambientais"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "desligado"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "baixo"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "elevado"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Ecrã completo"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Mudar para ecrã completo"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "É necessário reiniciar para as alterações terem efeito."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Mudando OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "É necessário reiniciar para as alterações terem efeito."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "É necessário reiniciar para as alterações terem efeito."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Usar"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nível: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Dinheiro: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Estado"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr ""
 "Copy text   \t\r\n"
 "Ataque %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr ""
 "Copy text   \t\r\n"
 "Defesa %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr ""
 "Copy text   \t\r\n"
 "Ataque %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr ""
 "Copy text   \t\r\n"
 "Defesa %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Força:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agilidade:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalidade:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligência:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Destreza:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Recebe %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Dá:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Tem a certeza que quer apagar este personagem"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Conectando..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Conectando..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Conectando..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nome: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -959,9 +1683,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Escolha o seu Servidor de Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Porta:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Por favor escreva o endereço e a porta do servidor."
 
@@ -988,6 +1709,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Peso Total: %d - Peso Máximo: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Manter"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 586cfc2d..a1e318a6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-12-14 21:37+0000\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -17,901 +17,1628 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efeito: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Parar"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Vender"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Confimar exclusão do personagem"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza de que deseja excluir este personagem?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Selecionar personagem"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Novo"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Excluir"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Anterior"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Próximo"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Próximo"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Novo"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Excluir"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Cor do Cabelo:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Criar"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Selecionar personagem"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Criar"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Trocando OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Porta:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Servidor:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Sim"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Não"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Usar"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventório"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Usar"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Descartar"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Descrição: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Efeito: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Nome:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Efeito: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Descrição: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Selecionar montante de itens para negociar."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Selecionar montante de itens para descartar."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "Lembrar nome de usuário"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Porta:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Manter"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Habilidades"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "MiniMapa"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@Negociar|Negociar com %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@atacar|Atacar %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@falar|Falar com NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancelar|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pegar|Pegar %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@usar|Equipar@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@usar|Equipar@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@usar|Usar@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@descartar|Descartar@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@descrição|Descrição@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Homem"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Mulher"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "O nome do usuário precisa ter pelo menos %d caracteres."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "O nome do usuário tem que ser inferior a %d caracteres."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "A senha deve ter pelo menos %d caracteres."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "A senha deve ser menor que %d caracteres."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Erro"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Som"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volume Sfx"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Volume da Música"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Cor do Cabelo:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Aperto o botão para começar a calibração"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Parar"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Excluir"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Nome:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Opacidade da GUI"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "desligado"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "baixo"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "alto"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Tela cheia"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Mudando para Tela cheia"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Trocando OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "É preciso reiniciar para as mudanças terem efeito."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "É preciso reiniciar para as mudanças terem efeito."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Usar"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nível: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Dinheiro: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Ataque %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Defesa %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Ataque %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Defesa %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Força:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agilidade:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalidade:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligência:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Destreza:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Voc pegou %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Você dá:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Tem certeza de que deseja excluir este personagem?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Conectando..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Conectando..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Conectando..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nome: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "Lembrar nome de usuário"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Gerenciamento de Conta e Personagem"
 
@@ -972,9 +1699,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Escolha seu Servidor de Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Porta:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Por favor especifique ambos os Endereços e a Porta do servidor"
 
@@ -1004,6 +1728,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Peso Total: %d - Peso Máximo: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Manter"
diff --git a/po/ru.po b/po/ru.po
index 94be1f08..9dc5c43a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-01-08 11:50+0000\n"
 "Last-Translator: idle sign <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -17,898 +17,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Купить"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Стоимость: %d GP / Всегоl: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Выход"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Эффект: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Стоп"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Продать"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Выбор персонажа"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Новый"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Удалить"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Предыдущий"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Следующий"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Имя: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Деньги: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Предыдущий"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Следующий"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Новый"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Удалить"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Создать персонажа"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Цвет волос:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Стрижка:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Создать"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Выбор персонажа"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Создать"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Переключение на OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Порт:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Сервер:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Да"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Нет"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Использовать"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Снаряжение"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Инвентарь"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Использовать"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Сбросить"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Описание: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Эффект: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Имя:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Эффект: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Описание: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Снять"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Надеть"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Вход"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Порт:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Оставить"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Состояние"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Умения"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Клавиша"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "МиниКарта"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "МиниКарта"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Торговать с %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Атаковать %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Говорить с NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancelОтмена@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Подобрать %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Надеть@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Надеть@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Использовать@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Сбросить@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Описание@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Подтвердите:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Имя пользователя должно содержать не менее %d символов."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Имя пользователя не должно содержать более %d символов."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Пароль должен содержать не менее %d символов."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Пароль не должен содержать более %d символов."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Звук"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Громкость эффектов"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Громкость музыки"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Применить"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Восстановить расположение окон"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Видео"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Аудио"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Джойстик"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Цвет волос:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Калибровать"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Использовать джойстик"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Стоп"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Вращайте рукоять"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Удалить"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Имя:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "На полный экран"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Выборочный курсор"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Ограничение кадр/с:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Прозрачность интерфейса"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Радиус прокрутки"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Заторможенность прокрутки"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "выкл"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "низ."
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "выс."
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "На полный экран"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Переход к OpenGL требует перезагрузки игры."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Использовать"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Деньги: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Состояние"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Атака %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Защита %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Атака %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Защита %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Сила:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Выносливость:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Живучесть:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Интеллект:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Ловкость:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Добавить"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Вы получили %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Вы отдаете:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Вы уверены, что хотите удалить этого персонажа?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Соединение..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Соединение..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Соединение..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Имя: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Соединение..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -951,9 +1675,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Выберите сервер Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Порт:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Следует указать адрес и порт сервера."
 
@@ -980,6 +1701,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Суммарный вес: %d - Макс. вес: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Оставить"
diff --git a/po/sk.po b/po/sk.po
index 453c67dc..e6b7a602 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-12-30 14:07+0000\n"
 "Last-Translator: TomasKovacik <nail@nodomain.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -17,887 +17,1598 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kúpiť"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Spolu: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Potvrdte zmazanie postavy"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 #, fuzzy
 msgid "Select Character"
 msgstr "Vytvoriť postavu"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ano"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Nový"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Vymazať"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Predchádzajúci"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Nasledujúci"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Peniaze: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Predchádzajúci"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Nasledujúci"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Nový"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Vymazať"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ano"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Vytvoriť postavu"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Meno"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Farba vlasov:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Štýl vlasov:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Vytvoriť"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Vytvoriť"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr ""
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+msgid "Party"
+msgstr ""
+
+#: ../src/gui/colour.cpp:38
+msgid "Server"
+msgstr ""
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr ""
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr ""
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
+#: ../src/gui/inventorywindow.cpp:55
+msgid "Drop"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:57
-msgid "Drop"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Popis: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effekt: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Meno"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effekt: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Popis: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr ""
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
+
+#: ../src/gui/login.cpp:75
+msgid "Keep"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr ""
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+msgid "Map"
+msgstr ""
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+msgid "@@attack|Attack "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Muž"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Žena"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Farba vlasov:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Vymazať"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Meno"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+msgid "use"
+msgstr ""
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Level: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Peniaze: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 msgid "Stats"
 msgstr ""
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Sila:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 msgid "Agility"
 msgstr ""
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 msgid "Vitality"
 msgstr ""
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligencia:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Naozaj chcete odstrániť túto postavu?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+msgid "Trying to connect to account server..."
+msgstr ""
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+msgid "Trying to connect to char server..."
+msgstr ""
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+msgid "Trying to connect to map server..."
+msgstr ""
+
+#: ../src/main.cpp:668
+#, c-format
+msgid "Map: %s"
+msgstr ""
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 85e37a50..e4c7a401 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-05-07 19:04+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,898 +17,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Köp"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Totalt: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Stopp"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Sälj"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Är du säker på att du vill ta bort den här karaktären?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Välj karaktär"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Ny"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Ta bort"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Föregående"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Nästa"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Namn: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Pengar: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Föregående"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Nästa"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Ny"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Ta bort"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Skapa karaktär"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Hårfärg:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Frisyr:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Skapa"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Välj karaktär"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Skapa"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Ändrar OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Använd"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventarium"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Använd"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Släpp"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Beskrivning: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effekt: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Namn:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effekt: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Beskrivning: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Avrusta"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Utrusta"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Välj antal föremål att handla med."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Välj antal föremål att släppa."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Användarnamn"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Behåll"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registrera"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Färdigheter"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Genväg"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Inställningar"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Minikarta"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Minikarta"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Handla med %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Attackera %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Prata med NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Avbryt@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Plocka upp %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Utrusta@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Utrusta@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Använd@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Släpp@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Beskrivning@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Bekräfta:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Användarnamnet måste vara minst %d tecken långt."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Användarnamnet måste vara kortare än %d tecken."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Lösenordet måste vara minst %d tecken långt."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Lösenordet måste vara kortare än %d tecken."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Fel"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Ljud"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volym för ljudeffekter"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Musikvolym"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Verkställ"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Återställ fönster"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Ljud"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Hårfärg:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Klicka på knappen för att starta kalibreringen"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Kalibrera"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Aktivera joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Rotera spaken"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Ta bort"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Namn:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Helskärm"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Särskild muspekare"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "FPS-gräns:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Genomskinlighet"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Rullningsradie"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Tröghet för rullning"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Omgivande FX"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "av"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "låg"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "hög"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Helskärm"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Byte till helskärm"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Ändrar OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Omstart krävs för att ändringarna ska synas."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Omstart krävs för att ändringarna ska synas."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Använd"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Pengar: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Attack %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Försvar %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Attack %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Försvar %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Styrka:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Smidighet:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Hälsa:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligens:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Skicklighet:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Du får %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Du ger:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Är du säker på att du vill ta bort den här karaktären?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Ansluter..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Ansluter..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Ansluter..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Namn: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Ansluter..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -951,9 +1675,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Välj din Mana World-server"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Var vänlig skriv både adressen och porten till en server."
 
@@ -980,6 +1701,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Nuvarande vikt: %d - Maxvikt: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Behåll"
diff --git a/po/th.po b/po/th.po
index e2ee2ab5..b5937c8d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-11-25 06:16+0000\n"
 "Last-Translator: Tharawut Paripaiboon <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -17,892 +17,1603 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "ซื้อ"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "ราคา: %d GP / ทั้งหมด: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "ออก"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "ยืนยันการลบตัวละคร"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 #, fuzzy
 msgid "Select Character"
 msgstr "สร้างตัวละคร"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "ตกลง"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "สร้างใหม่"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "ลบทิ้ง"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "ก่อนหน้า"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "ถัดไป"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "ชื่อ: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "ก่อนหน้า"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "ถัดไป"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "สร้างใหม่"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "ลบทิ้ง"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "ตกลง"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "สร้างตัวละคร"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "สีผม:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "ทรงผม:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "สร้าง"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "สร้าง"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr ""
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+msgid "Party"
+msgstr ""
+
+#: ../src/gui/colour.cpp:38
+msgid "Server"
+msgstr ""
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "ใช่"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "ไม่"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "ใช้"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "ใช้"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "ทิ้ง"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+msgid "Description:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+msgid "Effect:"
+msgstr ""
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "ชื่อ:"
+
+#: ../src/gui/inventorywindow.cpp:170
+msgid "Effect: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:172
+msgid "Description: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "เข้าระบบ"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr ""
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr ""
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "สมัครสมาชิก"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "สถานะ"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "ตั้งค่า"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+msgid "Map"
+msgstr ""
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+msgid "@@attack|Attack "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "ยืนยัน:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "ชาย"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "หญิง"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "ผิดพลาด"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "สีผม:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "ลบทิ้ง"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "ชื่อ:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+msgid "Restart your client or change maps for the change to take effect."
+msgstr ""
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "ใช้"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, c-format
 msgid "Money: %d GP"
 msgstr ""
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "สถานะ"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Strength:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agility:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitality:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligence:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dexterity:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "กำลังเชื่อมต่อ..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "กำลังเชื่อมต่อ..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "กำลังเชื่อมต่อ..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "ชื่อ: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 031fde9c..7fca175b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-09-17 14:41+0000\n"
 "Last-Translator: luojie-dune <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -17,898 +17,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "买"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "价格：%d GP/总数：%d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "影响: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "停止"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "出售"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个较色"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "选择较色"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "OK"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "新建"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "删除"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "上一页"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "下一页"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "名字：%s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "金钱：%d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "上一页"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "下一页"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "新建"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "删除"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "OK"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "创建角色"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "名称"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "头发颜色"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "发型"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "建立"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "选择较色"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "建立"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "服务器："
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "改变成OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "端口："
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "服务器："
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "是"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "否"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "使用"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "装备"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "清单"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "使用"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "丢弃"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "描述：%s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "影响: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "名称"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "影响: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "描述：%s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "卸下装备"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量"
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量"
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "登陆"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "密码："
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "端口："
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "保持"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "注册"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "状态"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "快捷键"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "安装"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "小地图"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "小地图"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@交易|与%s交易@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@攻击|攻击%s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@谈话|和NPC谈话@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@取消|取消@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@捡起|捡起%s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@使用|装备@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@使用|装备@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@使用|使用@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@丢弃|丢弃@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@描述|描述@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "确定"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "用户名至少需要%d个字符"
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用户名不能少于%d个字符"
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密码需要至少%d个字符"
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "密码不能少于%d个字符"
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "错误"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "声音"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "音效声量"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "音乐声量"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "应用"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "重置窗口"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "视频"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "音频"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "游戏杆"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "头发颜色"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "校准"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "启用游戏杆"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "停止"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "旋转手柄"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "删除"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "名称"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "通常的光标"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "FPS限制"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "滚动半径"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "拉动极限"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "环境音效"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "离线"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "全屏"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "切换到全屏"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "只有改变生效后才能重启"
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "改变成OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "只有改变生效后才能重启"
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "只有改变生效后才能重启"
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "使用"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "等级：%d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "金钱：%d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "状态"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "攻击 %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "防护 %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "攻击 %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "防护 %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "力量"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "敏捷:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "体力:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "智力:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "智慧:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "添加"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "你得到%d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "你得到："
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "你确定想删除这个较色"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "连接中..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "连接中..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "连接中..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "名字：%s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "连接中..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -951,9 +1675,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "请选择你的魔法世界服务器"
 
-#~ msgid "Port:"
-#~ msgstr "端口："
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "请输入服务器的IP地址和端口"
 
@@ -980,6 +1701,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "总的力量：%d - 最大力量：%d"
-
-#~ msgid "Keep"
-#~ msgstr "保持"