15 files changed, 4138 insertions, 5108 deletions
diff --git a/po/da.po b/po/da.po
index 7255c490..7427bab3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: 2009-07-25 17:33+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -18,85 +18,85 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Opsætning"
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Opretter forbindelse til kort-serveren..."
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 #, fuzzy
 msgid "Logging in"
 msgstr "Log Ind"
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Vælg Karakter"
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Opretter forbindelse til kort-serveren..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr "Fejl"
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 #, fuzzy
 msgid "Password Change"
 msgstr "Adgangskode:"
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 #, fuzzy
 msgid "Email Change"
 msgstr "Ændre"
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Frameld"
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ugyldig opdaterings host: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
@@ -546,25 +546,25 @@ msgstr "Pris: %s / Total: %s"
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr "Maks"
 
@@ -582,7 +582,7 @@ msgstr "Sælg"
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Fortryd"
@@ -683,7 +683,7 @@ msgid "Hair style:"
 msgstr "Frisure:"
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr "Opret"
 
@@ -739,7 +739,7 @@ msgstr "Frameld"
 msgid "Change Email"
 msgstr "Skift e-mail adresse"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Slet"
@@ -753,7 +753,7 @@ msgstr "Luk"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr ""
 
@@ -828,12 +828,12 @@ msgstr "Partikeldetaljer"
 msgid "Ambient FX: %s"
 msgstr "Omgivende FX"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Udstyr"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "Tag af"
@@ -842,47 +842,47 @@ msgstr "Tag af"
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Luk"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventarliste"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Tag på"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Brug"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 #, fuzzy
 msgid "Drop..."
 msgstr "Smid"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Opdel"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr "Vægt:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Smid"
 
@@ -994,220 +994,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Tag af"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Tekst"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Skygger"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Kontur"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Baggrund"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Fremhæv"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Fremhæv tab"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Du har ikke penge nok"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Du har udrustet dig"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Bruger"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Hvisk"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "Er"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Gruppe"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Opret en guild"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Server"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "Logger"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Hyperlink"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "Skabning"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Andre spilleres navne"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Eget navn"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "GM-navne"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPC'er"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Monstre"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Ukendt genstand"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Alment formål"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Hatte"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "Forbrugsvarer"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Trøjer"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "Ethåndsvåben"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Bukser"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Sko"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "Ethåndsvåben"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Skjolde"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Ringe"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Halskæder"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Våben"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Ammunition"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Partikeleffekter"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "Opsamlingsnotits"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "XP-notits"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "Spiller rammer monster"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Monster rammer spiller"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Kritisk sår"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Rammer forbi"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "HP tabel"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "HP tabel 3/4 fuld"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "HP tabel 1/2 fuld"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "HP tabel 1/4 fuld"
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
@@ -1293,11 +1079,11 @@ msgstr "Saml op"
 msgid "Add to chat"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr "Hent fra lager"
 
@@ -1369,49 +1155,49 @@ msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 msgid "Passwords do not match."
 msgstr "De indtastede adgangskoder stemmer ikke overens."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Vælg din server"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 #, fuzzy
 msgid "Connect"
 msgstr "Opretter forbindelse..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 #, fuzzy
 msgid "Custom Server"
 msgstr "Brugerdefineret cursor"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 msgid "Please type both the address and the port of a server."
 msgstr "Skriv både adressen og porten på serveren."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Venter på serveren"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr ""
 
@@ -1448,54 +1234,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "Sådan ser farven ud."
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr "Farver"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 #, fuzzy
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "Fastlåst"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "Pulserende"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr "Regnbuefarvet"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 #, fuzzy
 msgid "Delay:"
 msgstr "Forsinkelse: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 #, fuzzy
 msgid "Red:"
 msgstr "Rød: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 #, fuzzy
 msgid "Green:"
 msgstr "Grøn: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 #, fuzzy
 msgid "Blue:"
 msgstr "Blå: "
@@ -1541,10 +1327,15 @@ msgid "Assign"
 msgstr "Tildel"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Tildel"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Standard"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "Tast Konfikt(er) Opdaget."
 
@@ -1621,6 +1412,10 @@ msgstr "Stor"
 msgid "No text"
 msgstr "Ingen tekst"
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "Tekst"
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Bobler uden navne"
@@ -1781,217 +1576,217 @@ msgstr "Ændrede Partikeleffekter."
 msgid "Changes will take effect on map change."
 msgstr "Ændringerne træder i kraft når du er går til et nyt kort."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Færdigheder"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr "Op"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Færdigheds-points: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Færdigheds-points: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Færdigheder"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Niveau: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Oprettede en ny guild"
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "ER du sikker på at du vil afslutte programmet?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Inviter en spiller til din gruppe"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Inviter en spiller til din gruppe"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "ER du sikker på at du vil afslutte programmet?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 #, fuzzy
 msgid "Create Party"
 msgstr "Lav en ny karakter."
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 #, fuzzy
 msgid "Invite"
 msgstr "Inviter en spiller"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 #, fuzzy
 msgid "Leave"
 msgstr "Stor"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Du har accepteret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Du har ignoreret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Du har accepteret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Du har ignoreret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 #, fuzzy
 msgid "Guild Name"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Vælg din server"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s har inviteret med i %s's gruppe."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Accepter invitationen"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s har inviteret med i sin gruppe"
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s har inviteret med i %s's gruppe."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har inviteret med i sin gruppe"
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har inviteret med i %s's gruppe."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr "Accepter invitationen"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
 msgid "Party Name"
 msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Vælg din server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
@@ -2005,25 +1800,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr "Penge: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr "MP:"
 
@@ -2078,7 +1873,7 @@ msgstr "Færdigheds-points: %d"
 msgid "Level"
 msgstr "Niveau: %d"
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "Opbevaret"
 
@@ -2304,11 +2099,11 @@ msgstr ""
 "Denne kommando starter med at \"optage\" chat-loggen. Den gemmer en kopi i "
 "<filnavn>"
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Genvej"
 
@@ -2514,20 +2309,20 @@ msgstr ""
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt."
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2857,6 +2652,10 @@ msgstr "% Undgå angreb."
 msgid "% Critical"
 msgstr "Kritisk sår"
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Opret en guild"
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Vis denne hjælpebesked."
@@ -2925,6 +2724,10 @@ msgstr "Ukendt invitations-svar fra %s."
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Gruppe"
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Inviter en spiller med i din gruppe"
@@ -3759,10 +3562,151 @@ msgid "Unknown item"
 msgstr "Ukendt genstand"
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr "unavngivet"
 
+#~ msgid "Text Shadow"
+#~ msgstr "Skygger"
+
+#~ msgid "Text Outline"
+#~ msgstr "Kontur"
+
+#~ msgid "Background"
+#~ msgstr "Baggrund"
+
+#~ msgid "Highlight"
+#~ msgstr "Fremhæv"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Fremhæv tab"
+
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Du har ikke penge nok"
+
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Du har udrustet dig"
+
+#~ msgid "GM"
+#~ msgstr "GM"
+
+#~ msgid "Player"
+#~ msgstr "Bruger"
+
+#~ msgid "Whisper"
+#~ msgstr "Hvisk"
+
+#~ msgid "Is"
+#~ msgstr "Er"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Logger"
+#~ msgstr "Logger"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Hyperlink"
+
+#~ msgid "Being"
+#~ msgstr "Skabning"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Andre spilleres navne"
+
+#~ msgid "Own Name"
+#~ msgstr "Eget navn"
+
+#~ msgid "GM Names"
+#~ msgstr "GM-navne"
+
+#~ msgid "NPCs"
+#~ msgstr "NPC'er"
+
+#~ msgid "Monsters"
+#~ msgstr "Monstre"
+
+#~ msgid "Unknown Item Type"
+#~ msgstr "Ukendt genstand"
+
+#~ msgid "Generics"
+#~ msgstr "Alment formål"
+
+#~ msgid "Hats"
+#~ msgstr "Hatte"
+
+#~ msgid "Usables"
+#~ msgstr "Forbrugsvarer"
+
+#~ msgid "Shirts"
+#~ msgstr "Trøjer"
+
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Ethåndsvåben"
+
+#~ msgid "Pants"
+#~ msgstr "Bukser"
+
+#~ msgid "Shoes"
+#~ msgstr "Sko"
+
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Ethåndsvåben"
+
+#~ msgid "Shields"
+#~ msgstr "Skjolde"
+
+#~ msgid "Rings"
+#~ msgstr "Ringe"
+
+#~ msgid "Necklaces"
+#~ msgstr "Halskæder"
+
+#~ msgid "Arms"
+#~ msgstr "Våben"
+
+#~ msgid "Ammo"
+#~ msgstr "Ammunition"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Partikeleffekter"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "Opsamlingsnotits"
+
+#~ msgid "Exp Notification"
+#~ msgstr "XP-notits"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Spiller rammer monster"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Monster rammer spiller"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Kritisk sår"
+
+#~ msgid "Misses"
+#~ msgstr "Rammer forbi"
+
+#~ msgid "HP Bar"
+#~ msgstr "HP tabel"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "HP tabel 3/4 fuld"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "HP tabel 1/2 fuld"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "HP tabel 1/4 fuld"
+
 #~ msgid "@@trade|Trade With %s@@"
 #~ msgstr "@@trade|Handl med %s@@"
 
diff --git a/po/de.po b/po/de.po
index 1013271c..db9b2351 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:43+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: 2010-01-02 15:26+0000\n"
 "Last-Translator: Jonathan Raphael Joachim Kolberg\n"
 "Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
@@ -21,84 +21,84 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Verbinde mit [Benutzerdatenserver]..."
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 #, fuzzy
 msgid "Logging in"
 msgstr "Anmelden"
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Spielfigur auswählen"
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Verbinde mit [Charakterserver]..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 msgid "Password Change"
 msgstr "Passwort ändern:"
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Mitglied wurde erfolgreich Befördert."
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Abmelden"
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
@@ -554,25 +554,25 @@ msgstr "Preis: %s / Gesamt: %s"
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr "-"
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr "Max"
 
@@ -590,7 +590,7 @@ msgstr "Verkaufen"
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -686,7 +686,7 @@ msgid "Hair style:"
 msgstr "Frisur:"
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr "Erstellen"
 
@@ -741,7 +741,7 @@ msgstr "Abmelden"
 msgid "Change Email"
 msgstr "E-Mailadresse ändern"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Löschen"
@@ -754,7 +754,7 @@ msgstr "Wähle"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr "Chat"
 
@@ -829,12 +829,12 @@ msgstr "Partikeldetails: %s"
 msgid "Ambient FX: %s"
 msgstr "Hintergrundeffekte: %s"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "Ablegen"
@@ -843,46 +843,46 @@ msgstr "Ablegen"
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Schließen"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventar"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Benutzen"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 msgid "Drop..."
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Aufteilen"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr "Plätze:"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Wegwerfen"
 
@@ -992,214 +992,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr "erstes ausziehen"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Text"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Textschatten"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Textaußenlinie"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "Fortschrittsbalkenbeschriftungen"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr "Buttons"
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr "Deaktivierte Buttons"
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr "Tabs"
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Hintergrund"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Hervorgehoben"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Hervorgehobener Tab"
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr "Gegenstand ist zu teuer"
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr "Gegenstand ist in Verwendung"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Spieler"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "geflüsterte Nachricht"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "Handlungen"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Party"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Gilde"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Server"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "Logger"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Verknüpfung"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "Aktionen"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Namen anderer Spieler"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Eigener Name"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "Namen von GM"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCs"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Monster"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Unbekannter Gegenstand"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Allgemeiner Gegenstand"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Hüte"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "Benutzbare Gegenstände"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Hemden"
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr "Einhänder"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Hosen"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Schuhe"
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr "Zweihänder"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Schilde"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Ringe"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Halsketten"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Waffen"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Munition"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Partikeleffekte"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "aufgehobene Gegenstände"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "Anzeige der Erfahrungspunkte"
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr "Spieler trifft Monster"
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr "Monster trifft Spieler"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Kritischer Treffer"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Verfehlt"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "HP Leiste"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 HP Leiste"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 HP Leiste"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 HP Leiste"
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
@@ -1281,11 +1073,11 @@ msgstr "Hebe %s auf"
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr "Abholen"
 
@@ -1357,46 +1149,46 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 msgid "Connect"
 msgstr "Verbinde..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 #, fuzzy
 msgid "Custom Server"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 msgid "Please type both the address and the port of a server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
@@ -1435,50 +1227,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Soundengine"
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "So wird die Farbe aussehen"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr "Farben"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "Statisch"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "Pulsierend"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr "Regenbogen"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 msgid "Delay:"
 msgstr "Verzögerung: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 msgid "Red:"
 msgstr "Rot: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 msgid "Green:"
 msgstr "Grün: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 msgid "Blue:"
 msgstr "Blau: "
 
@@ -1523,10 +1315,15 @@ msgid "Assign"
 msgstr "Zuordnen"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Zuordnen"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Standard"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 #, fuzzy
 msgid "Key Conflict(s) Detected."
 msgstr "Tastenkonflikte entdeckt."
@@ -1604,6 +1401,10 @@ msgstr "Groß"
 msgid "No text"
 msgstr "Kein Text"
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "Text"
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Blasen, keine Namen"
@@ -1768,217 +1569,217 @@ msgstr "Partikeleffekteinstellungen geändert."
 msgid "Changes will take effect on map change."
 msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Fertigkeiten"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr "Erhöhen"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Fähigkeitspunkte: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Fertigkeiten"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Stufe: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, fuzzy, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Spieler %s einladen"
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Gilde %s wurde aufgelöst."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 #, fuzzy
 msgid "Member Invite to Guild"
 msgstr "Spieler einladen"
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, fuzzy, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Wen möchtest du einladen?"
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Gilde erstellen"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "Spieler %s einladen"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "Spieler einladen"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, fuzzy, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wen möchtest du einladen?"
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr "Gilde erstellen"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 #, fuzzy
 msgid "Create Party"
 msgstr "Charakter erstellen"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 #, fuzzy
 msgid "Social"
 msgstr "Special"
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 #, fuzzy
 msgid "Invite"
 msgstr "einladen"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 #, fuzzy
 msgid "Leave"
 msgstr "Stufe: %d"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Partyeinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Partyeinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Partyeinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Partyeinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Erstelle der Gilde %s."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, fuzzy, c-format
 msgid "Creating party called %s."
 msgstr "Erstelle der Gilde %s."
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 msgid "Guild Name"
 msgstr "Gildenname"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 msgid "Choose your guild's name."
 msgstr "Wähle den Namen deiner Gilde"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 msgid "Accept Guild Invite"
 msgstr "Nehme Gildeneinladung an"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s hat dich in seine Party eingeladen."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Party eingeladen."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr "Nehme Partyeinladung an"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
 msgid "Party Name"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Wähle den Namen deiner Gilde"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr "Special"
 
@@ -1992,25 +1793,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr "MP:"
 
@@ -2063,7 +1864,7 @@ msgstr "Fähigkeitspunkte: %d"
 msgid "Level"
 msgstr "Stufe: %d"
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "Lager"
 
@@ -2287,11 +2088,11 @@ msgstr ""
 "Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
 "<Dateiname>."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Tastenkürzel"
 
@@ -2497,20 +2298,20 @@ msgstr "Ignoriere Eingabe 1"
 msgid "Ignore input 2"
 msgstr "Ignoriere Eingabe 2"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Bitte beheben, oder es wird zu merkwürdigem Verhalten im Spiel kommen."
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr "Kann das nicht aufheben."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2821,6 +2622,10 @@ msgstr "% Evade"
 msgid "% Critical"
 msgstr "% Critical"
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Gilde"
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Diese Hilfe anzeigen"
@@ -2890,6 +2695,10 @@ msgstr "Unbekannte Reaktion auf die Einladung von %s."
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Party"
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
@@ -3711,10 +3520,157 @@ msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr "unbenannt"
 
+#~ msgid "Text Shadow"
+#~ msgstr "Textschatten"
+
+#~ msgid "Text Outline"
+#~ msgstr "Textaußenlinie"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Fortschrittsbalkenbeschriftungen"
+
+#~ msgid "Buttons"
+#~ msgstr "Buttons"
+
+#~ msgid "Disabled Buttons"
+#~ msgstr "Deaktivierte Buttons"
+
+#~ msgid "Tabs"
+#~ msgstr "Tabs"
+
+#~ msgid "Background"
+#~ msgstr "Hintergrund"
+
+#~ msgid "Highlight"
+#~ msgstr "Hervorgehoben"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Hervorgehobener Tab"
+
+#~ msgid "Item Too Expensive"
+#~ msgstr "Gegenstand ist zu teuer"
+
+#~ msgid "Item Is Equipped"
+#~ msgstr "Gegenstand ist in Verwendung"
+
+#~ msgid "GM"
+#~ msgstr "GM"
+
+#~ msgid "Player"
+#~ msgstr "Spieler"
+
+#~ msgid "Whisper"
+#~ msgstr "geflüsterte Nachricht"
+
+#~ msgid "Is"
+#~ msgstr "Handlungen"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Logger"
+#~ msgstr "Logger"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Verknüpfung"
+
+#~ msgid "Being"
+#~ msgstr "Aktionen"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Namen anderer Spieler"
+
+#~ msgid "Own Name"
+#~ msgstr "Eigener Name"
+
+#~ msgid "GM Names"
+#~ msgstr "Namen von GM"
+
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
+
+#~ msgid "Monsters"
+#~ msgstr "Monster"
+
+#~ msgid "Unknown Item Type"
+#~ msgstr "Unbekannter Gegenstand"
+
+#~ msgid "Generics"
+#~ msgstr "Allgemeiner Gegenstand"
+
+#~ msgid "Hats"
+#~ msgstr "Hüte"
+
+#~ msgid "Usables"
+#~ msgstr "Benutzbare Gegenstände"
+
+#~ msgid "Shirts"
+#~ msgstr "Hemden"
+
+#~ msgid "One Handed Weapons"
+#~ msgstr "Einhänder"
+
+#~ msgid "Pants"
+#~ msgstr "Hosen"
+
+#~ msgid "Shoes"
+#~ msgstr "Schuhe"
+
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Zweihänder"
+
+#~ msgid "Shields"
+#~ msgstr "Schilde"
+
+#~ msgid "Rings"
+#~ msgstr "Ringe"
+
+#~ msgid "Necklaces"
+#~ msgstr "Halsketten"
+
+#~ msgid "Arms"
+#~ msgstr "Waffen"
+
+#~ msgid "Ammo"
+#~ msgstr "Munition"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Partikeleffekte"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "aufgehobene Gegenstände"
+
+#~ msgid "Exp Notification"
+#~ msgstr "Anzeige der Erfahrungspunkte"
+
+#~ msgid "Player Hits Monster"
+#~ msgstr "Spieler trifft Monster"
+
+#~ msgid "Monster Hits Player"
+#~ msgstr "Monster trifft Spieler"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Kritischer Treffer"
+
+#~ msgid "Misses"
+#~ msgstr "Verfehlt"
+
+#~ msgid "HP Bar"
+#~ msgstr "HP Leiste"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 HP Leiste"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 HP Leiste"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 HP Leiste"
+
 #~ msgid "help"
 #~ msgstr "Hilfe"
 
@@ -4062,9 +4018,6 @@ msgstr "unbenannt"
 #~ msgid "joystickEnabled"
 #~ msgstr "Joystick"
 
-#~ msgid "assign"
-#~ msgstr "Zuordnen"
-
 #~ msgid "makeDefault"
 #~ msgstr "stelle Standardeinstellungen her"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 1edd2d12..b0aa3024 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: 2010-03-04 21:01+0000\n"
 "Last-Translator: issyl0 <isabell121@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -18,86 +18,86 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Setup"
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Connecting to map server..."
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 #, fuzzy
 msgid "Logging in"
 msgstr "Login"
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Select Character"
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Connecting to map server..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 #, fuzzy
 msgid "Password Change"
 msgstr "Password:"
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 #, fuzzy
 msgid "Email Change"
 msgstr "Change"
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Member was promoted successfully."
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Unregister"
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalid update host: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr "Error creating updates directory!"
 
@@ -538,25 +538,25 @@ msgstr "Price: %s / Total: %s"
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Exit"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr "Max"
 
@@ -574,7 +574,7 @@ msgstr "Sell"
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Cancel"
@@ -675,7 +675,7 @@ msgid "Hair style:"
 msgstr "Hair Style:"
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr "Create"
 
@@ -731,7 +731,7 @@ msgstr "Unregister"
 msgid "Change Email"
 msgstr "Change Email Address"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Delete"
@@ -745,7 +745,7 @@ msgstr "Close"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr "Chat"
 
@@ -820,12 +820,12 @@ msgstr "Particle Detail"
 msgid "Ambient FX: %s"
 msgstr "Ambient FX"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Equipment"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "Unequip"
@@ -834,47 +834,47 @@ msgstr "Unequip"
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Close"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventory"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Equip"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Use"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 #, fuzzy
 msgid "Drop..."
 msgstr "Drop"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Split"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr "Slots:"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr "Weight:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Drop"
 
@@ -986,220 +986,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Unequip"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Text"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Text Shadow"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Text Outline"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "Progress Bar Labels"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Background"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Highlight"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Tab Highlight"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Item too expensive"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Item is equipped"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Player"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Whisper"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "Is"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Party"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Guild"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Server"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "Logger"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Hyperlink"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "Being"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Other Players' Names"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Own Name"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "GM Names"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCs"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Monsters"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Unknown Item Type"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Generics"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Hats"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "Usables"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Shirts"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "1 Handed Weapons"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Shoes"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "1 Handed Weapons"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Shields"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Rings"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Necklaces"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Arms"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Ammunition"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Particle Effects"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "Pickup Notification"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "Exp Notification"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "Player hits Monster"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Monster hits Player"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Critical Hit"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Misses"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "HP Bar"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 HP Bar"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 HP Bar"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 HP Bar"
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
@@ -1285,11 +1071,11 @@ msgstr "Pick up"
 msgid "Add to chat"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr "Retrieve"
 
@@ -1361,49 +1147,49 @@ msgstr "The password needs to be less than %d characters long."
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Choose your server"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 #, fuzzy
 msgid "Connect"
 msgstr "Connecting..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 #, fuzzy
 msgid "Custom Server"
 msgstr "Custom cursor"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 msgid "Please type both the address and the port of a server."
 msgstr "Please type both the address and the port of a server."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Waiting for server"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr ""
 
@@ -1440,54 +1226,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "This is what the colour looks like"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr "Colours"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 #, fuzzy
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "Static"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "Pulse"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr "Rainbow"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 #, fuzzy
 msgid "Delay:"
 msgstr "Delay: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 #, fuzzy
 msgid "Red:"
 msgstr "Red: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 #, fuzzy
 msgid "Green:"
 msgstr "Green: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 #, fuzzy
 msgid "Blue:"
 msgstr "Blue: "
@@ -1533,10 +1319,15 @@ msgid "Assign"
 msgstr "Assign"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Assign"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Default"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "Key Conflict(s) Detected."
 
@@ -1613,6 +1404,10 @@ msgstr "Large"
 msgid "No text"
 msgstr "No text"
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "Text"
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Bubbles, no names"
@@ -1773,218 +1568,218 @@ msgstr "Particle effect settings changed."
 msgid "Changes will take effect on map change."
 msgstr "Changes will take effect on map change."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Skills"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr "Up"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Skill points: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Skill points: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Skills"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Level: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild created."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Create Guild"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Are you sure you want to quit?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Invite a user to party"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Invite a user to party"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Are you sure you want to quit?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr "Create Guild"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 #, fuzzy
 msgid "Create Party"
 msgstr "Create Character"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 #, fuzzy
 msgid "Invite"
 msgstr "Invite User"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 #, fuzzy
 msgid "Leave"
 msgstr "Large"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accepted invite from %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejected invite from %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accepted invite from %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejected invite from %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Error creating guild."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 #, fuzzy
 msgid "Guild Name"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Choose your server"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Received party request, but one already exists."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s has invited you to join the %s party."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Accept Party Invite"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr "Received party request, but one already exists."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s has invited you to join their party."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s has invited you to join the %s party."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s has invited you to join their party."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s has invited you to join the %s party."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr "Accept Party Invite"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
 msgid "Party Name"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Choose your server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
@@ -1998,25 +1793,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr "Money: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr "MP:"
 
@@ -2069,7 +1864,7 @@ msgstr "Skill points: %d"
 msgid "Level"
 msgstr "Level: %d"
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "Storage"
 
@@ -2288,11 +2083,11 @@ msgstr "This command displays the number of players currently online."
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "This command starts recording the chat log to the file <filename>."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Shortcut"
 
@@ -2498,20 +2293,20 @@ msgstr "Ignore input 1"
 msgid "Ignore input 2"
 msgstr "Ignore input 2"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Resolve them, or gameplay may result in strange behaviour."
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr "Unable to pick up item."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2842,6 +2637,10 @@ msgstr "% Evade:"
 msgid "% Critical"
 msgstr "Critical Hit"
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Guild"
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Display this help."
@@ -2910,6 +2709,10 @@ msgstr "Unknown invite response for %s."
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Party"
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invite a player to your party"
@@ -3749,10 +3552,151 @@ msgid "Unknown item"
 msgstr "Unknown item"
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr "unnamed"
 
+#~ msgid "Text Shadow"
+#~ msgstr "Text Shadow"
+
+#~ msgid "Text Outline"
+#~ msgstr "Text Outline"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Progress Bar Labels"
+
+#~ msgid "Background"
+#~ msgstr "Background"
+
+#~ msgid "Highlight"
+#~ msgstr "Highlight"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Tab Highlight"
+
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Item too expensive"
+
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Item is equipped"
+
+#~ msgid "GM"
+#~ msgstr "GM"
+
+#~ msgid "Player"
+#~ msgstr "Player"
+
+#~ msgid "Whisper"
+#~ msgstr "Whisper"
+
+#~ msgid "Is"
+#~ msgstr "Is"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Logger"
+#~ msgstr "Logger"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Hyperlink"
+
+#~ msgid "Being"
+#~ msgstr "Being"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Other Players' Names"
+
+#~ msgid "Own Name"
+#~ msgstr "Own Name"
+
+#~ msgid "GM Names"
+#~ msgstr "GM Names"
+
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
+
+#~ msgid "Monsters"
+#~ msgstr "Monsters"
+
+#~ msgid "Unknown Item Type"
+#~ msgstr "Unknown Item Type"
+
+#~ msgid "Generics"
+#~ msgstr "Generics"
+
+#~ msgid "Hats"
+#~ msgstr "Hats"
+
+#~ msgid "Usables"
+#~ msgstr "Usables"
+
+#~ msgid "Shirts"
+#~ msgstr "Shirts"
+
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "1 Handed Weapons"
+
+#~ msgid "Shoes"
+#~ msgstr "Shoes"
+
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "1 Handed Weapons"
+
+#~ msgid "Shields"
+#~ msgstr "Shields"
+
+#~ msgid "Rings"
+#~ msgstr "Rings"
+
+#~ msgid "Necklaces"
+#~ msgstr "Necklaces"
+
+#~ msgid "Arms"
+#~ msgstr "Arms"
+
+#~ msgid "Ammo"
+#~ msgstr "Ammunition"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Particle Effects"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "Pickup Notification"
+
+#~ msgid "Exp Notification"
+#~ msgstr "Exp Notification"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Player hits Monster"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Monster hits Player"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Critical Hit"
+
+#~ msgid "Misses"
+#~ msgstr "Misses"
+
+#~ msgid "HP Bar"
+#~ msgstr "HP Bar"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 HP Bar"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 HP Bar"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 HP Bar"
+
 #~ msgid "no"
 #~ msgstr "No"
 
diff --git a/po/es.po b/po/es.po
index fe5d8a96..3f7ed258 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: 2010-02-24 20:55+0000\n"
 "Last-Translator: Miguel de Dios <tres.14159@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,86 +18,86 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 #, fuzzy
 msgid "Connecting to server"
 msgstr "conectando al servidor de mapas...."
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 #, fuzzy
 msgid "Logging in"
 msgstr "Iniciar sesión"
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Seleccionar personaje"
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "conectando al servidor de mapas...."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 #, fuzzy
 msgid "Password Change"
 msgstr "Contraseña:"
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 #, fuzzy
 msgid "Email Change"
 msgstr "Modificar"
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "El miembro ha sido promovido con exito."
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Cancelar Cuenta"
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "servidor de actualizaciones invalido: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr "error al crear directorio de actualizaciones"
 
@@ -547,25 +547,25 @@ msgstr "Precio: %s / Total: %s"
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Salir"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr "Máx"
 
@@ -583,7 +583,7 @@ msgstr "Vender"
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Cancelar"
@@ -684,7 +684,7 @@ msgid "Hair style:"
 msgstr "Corte de pelo:"
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr "Crear"
 
@@ -740,7 +740,7 @@ msgstr "Cancelar Cuenta"
 msgid "Change Email"
 msgstr "Cambiar dirección de correo electrónico"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Eliminar"
@@ -754,7 +754,7 @@ msgstr "Cerrar"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr "Chat"
 
@@ -829,12 +829,12 @@ msgstr "detalle particulas"
 msgid "Ambient FX: %s"
 msgstr "Efectos ambientales"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Equipo"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "quitarselo"
@@ -843,47 +843,47 @@ msgstr "quitarselo"
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 #, fuzzy
 msgid "Drop..."
 msgstr "Tirar"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr "Ranuras:"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Tirar"
 
@@ -995,220 +995,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr "quitarselo"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Texto"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Sombra del texto"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Borde del texto"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "etiquetas de la barra de progreso"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Fondo"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Resaltar"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Resaltar pestaña"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Objeto demasiado caro"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Objeto equipado"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "MJ"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Jugador"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Susurro"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "Es"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Grupo"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Clan"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Servidor"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "Registro"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Enlance"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "Ser"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Nombres de otros jugadores"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Nombre propio"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "Nombres de los MJs"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "PNJs"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Monstruos"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Objeto desconocido"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Genericos"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Sombreros"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "Consumibles"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Faldas"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "Armas de una mano"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Pantalones"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Zapatos"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "Armas de una mano"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Escudos"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Anillos"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Collares"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Brazos"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Munición"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Efectos de Partículas"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "Aviso de recogida"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "Aviso de Exp"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "Jugador golpea al monstruo"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Monstruo golpea a jugador"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Golpe Critico"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Fallos"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "Barra de salud"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "Barra de salud a 3 cuartos"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "Barra de salud a la mitad"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
@@ -1294,11 +1080,11 @@ msgstr "recoger"
 msgid "Add to chat"
 msgstr "@@chat|Añadir al chatt@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr "almacenar"
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr "recuperar"
 
@@ -1370,49 +1156,49 @@ msgstr "La contraseña puede tener como máximo %d caracteres."
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "elige tu servidor"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 #, fuzzy
 msgid "Server type:"
 msgstr "Servidor:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 #, fuzzy
 msgid "Connect"
 msgstr "Conectando…"
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 #, fuzzy
 msgid "Custom Server"
 msgstr "Cursor propio"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 msgid "Please type both the address and the port of a server."
 msgstr "Escriba la dirección y el puerto de un servidor."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Esperando al servidor"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr ""
 
@@ -1449,54 +1235,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "asi es  como queda el color"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr "colores"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 #, fuzzy
 msgid "Type:"
 msgstr "tipo: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "estatica"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "pulso"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr "arcoiris"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr "espectro"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 #, fuzzy
 msgid "Delay:"
 msgstr "retraso: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 #, fuzzy
 msgid "Red:"
 msgstr "rojo: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 #, fuzzy
 msgid "Green:"
 msgstr "verde: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 #, fuzzy
 msgid "Blue:"
 msgstr "azul: "
@@ -1542,10 +1328,15 @@ msgid "Assign"
 msgstr "Asignar"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Asignar"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Predeterminado"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "conflictos entre teclas detectados"
 
@@ -1622,6 +1413,10 @@ msgstr "grande"
 msgid "No text"
 msgstr "sin texto"
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "Texto"
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "burbujas sin nombres"
@@ -1782,218 +1577,218 @@ msgstr "efectos de particulas cambiados"
 msgid "Changes will take effect on map change."
 msgstr "los cambios tienen efecto en cuanto cambies de mapa"
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Habilidades"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr "Arriba"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "puntos de habilidad: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "puntos de habilidad: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Habilidades"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Nivel: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild créada."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Crear clan"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "¿Está seguro que desea salir?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Invita a un jugador a entrar en tu grupo"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Invita a un jugador a entrar en tu grupo"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "¿Está seguro que desea salir?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr "Crear clan"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 #, fuzzy
 msgid "Create Party"
 msgstr "Crear Personaje"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 #, fuzzy
 msgid "Invite"
 msgstr "Invitar a jugador"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 #, fuzzy
 msgid "Leave"
 msgstr "grande"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitacion acceptada de %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rechazada la invitacion de %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitacion acceptada de %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rechazada la invitacion de %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Eror al crear la guild."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 #, fuzzy
 msgid "Guild Name"
 msgstr "Clan"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "elige tu servidor"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Has recibido una invitation para un grupo, pero uno existe ya."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te invita a unirte al grupo %s."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitaciones a grupos"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr "Has recibido una invitation para un grupo, pero uno existe ya."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s te invita a unirte a su grupo."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s te invita a unirte al grupo %s."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te invita a unirte a su grupo."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te invita a unirte al grupo %s."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr "Aceptar invitaciones a grupos"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
 msgid "Party Name"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "elige tu servidor"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
@@ -2007,25 +1802,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr "Dinero: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr "PV:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr "EXP:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr "PM:"
 
@@ -2078,7 +1873,7 @@ msgstr "puntos de habilidad: %d"
 msgid "Level"
 msgstr "Nivel: %d"
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "almacenamiento"
 
@@ -2302,11 +2097,11 @@ msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando graba el registro del chat en el archivo <nombre de archivo>."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Atajos"
 
@@ -2512,20 +2307,20 @@ msgstr "ignorar entrada 1"
 msgid "Ignore input 2"
 msgstr "ignorar entrada 2"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "resuelvelo , o el juego puede comportarse de manera extraña"
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr "Imposible tomar objeto."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2856,6 +2651,10 @@ msgstr "% agilidad"
 msgid "% Critical"
 msgstr "Golpe Critico"
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Clan"
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Mostrar la ayuda"
@@ -2924,6 +2723,10 @@ msgstr "Respuesta a invitacion desconocida para %s."
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Grupo"
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invitar a un jugador a tu grupo"
@@ -3764,10 +3567,151 @@ msgid "Unknown item"
 msgstr "Objeto desconocido"
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr "Sin nombre"
 
+#~ msgid "Text Shadow"
+#~ msgstr "Sombra del texto"
+
+#~ msgid "Text Outline"
+#~ msgstr "Borde del texto"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "etiquetas de la barra de progreso"
+
+#~ msgid "Background"
+#~ msgstr "Fondo"
+
+#~ msgid "Highlight"
+#~ msgstr "Resaltar"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Resaltar pestaña"
+
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Objeto demasiado caro"
+
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Objeto equipado"
+
+#~ msgid "GM"
+#~ msgstr "MJ"
+
+#~ msgid "Player"
+#~ msgstr "Jugador"
+
+#~ msgid "Whisper"
+#~ msgstr "Susurro"
+
+#~ msgid "Is"
+#~ msgstr "Es"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "Logger"
+#~ msgstr "Registro"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Enlance"
+
+#~ msgid "Being"
+#~ msgstr "Ser"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Nombres de otros jugadores"
+
+#~ msgid "Own Name"
+#~ msgstr "Nombre propio"
+
+#~ msgid "GM Names"
+#~ msgstr "Nombres de los MJs"
+
+#~ msgid "NPCs"
+#~ msgstr "PNJs"
+
+#~ msgid "Monsters"
+#~ msgstr "Monstruos"
+
+#~ msgid "Unknown Item Type"
+#~ msgstr "Objeto desconocido"
+
+#~ msgid "Generics"
+#~ msgstr "Genericos"
+
+#~ msgid "Hats"
+#~ msgstr "Sombreros"
+
+#~ msgid "Usables"
+#~ msgstr "Consumibles"
+
+#~ msgid "Shirts"
+#~ msgstr "Faldas"
+
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Armas de una mano"
+
+#~ msgid "Pants"
+#~ msgstr "Pantalones"
+
+#~ msgid "Shoes"
+#~ msgstr "Zapatos"
+
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Armas de una mano"
+
+#~ msgid "Shields"
+#~ msgstr "Escudos"
+
+#~ msgid "Rings"
+#~ msgstr "Anillos"
+
+#~ msgid "Necklaces"
+#~ msgstr "Collares"
+
+#~ msgid "Arms"
+#~ msgstr "Brazos"
+
+#~ msgid "Ammo"
+#~ msgstr "Munición"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Efectos de Partículas"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "Aviso de recogida"
+
+#~ msgid "Exp Notification"
+#~ msgstr "Aviso de Exp"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Jugador golpea al monstruo"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Monstruo golpea a jugador"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Golpe Critico"
+
+#~ msgid "Misses"
+#~ msgstr "Fallos"
+
+#~ msgid "HP Bar"
+#~ msgstr "Barra de salud"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "Barra de salud a 3 cuartos"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "Barra de salud a la mitad"
+
 #~ msgid "no"
 #~ msgstr "no"
 
diff --git a/po/fr.po b/po/fr.po
index 7ef9164c..2150cf43 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: 2010-01-27 21:27+0000\n"
 "Last-Translator: JVC <Unknown>\n"
 "Language-Team: French\n"
@@ -19,86 +19,86 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Connexion au serveur de cartes..."
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 #, fuzzy
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Sélectionner votre personnnage"
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de cartes..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 #, fuzzy
 msgid "Password Change"
 msgstr "Mot de passe :"
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 #, fuzzy
 msgid "Email Change"
 msgstr "Changer"
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "La promotion de ce membre a réussie."
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Se désinscrire"
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Hôte de mise à jour incorrect : "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
@@ -557,25 +557,25 @@ msgstr "Prix : %s / Total : %s"
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr "-"
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr "Max."
 
@@ -593,7 +593,7 @@ msgstr "Vendre"
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Annuler"
@@ -694,7 +694,7 @@ msgid "Hair style:"
 msgstr "Coupe :"
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr "Créer"
 
@@ -750,7 +750,7 @@ msgstr "Se désinscrire"
 msgid "Change Email"
 msgstr "Modifier l'adresse mail"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Supprimer"
@@ -764,7 +764,7 @@ msgstr "Fermer"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr "Conversation"
 
@@ -839,12 +839,12 @@ msgstr "Détail des particules"
 msgid "Ambient FX: %s"
 msgstr "Effets ambiants"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Équipement"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "Retirer"
@@ -853,47 +853,47 @@ msgstr "Retirer"
 msgid "Help"
 msgstr "Aide"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Fermer"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventaire"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Équiper"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Utiliser"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 #, fuzzy
 msgid "Drop..."
 msgstr "Jeter"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Partager"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr "Cases :"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr "Poids :"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Jeter"
 
@@ -1005,220 +1005,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Retirer"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Texte"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Ombre du texte"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Bordure du texte"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "Texte des barres de progression"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Arrière-plan"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Surbrillance"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Onglet mis en surbrillance"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Objet trop cher"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "L'objet est équipé"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "MJ"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Joueur"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Message privé"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "Est"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Groupe"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Guilde"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Serveur"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "Historique"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Lien"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "Forme de vie"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Nom des autres joueurs"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Mon nom"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "Nom des MJ"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "PNJs"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Monstres"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Type inconnu d'objet"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Génériques"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Chapeaux"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "Utilisables"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Chemises"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "Armes à une main"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Pantalon"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Chaussures"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "Armes à une main"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Boucliers"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Anneaux"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Colliers"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Bras"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Munitions"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Effets de particules"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "Information de récupération"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "Information d'expérience"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "Le joueur touche le monstre"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Le monstre touche le joueur"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Coup critique"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Coups manqués"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "Barre de vie (niveau maximum)"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 Barre de vie"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 Barre de vie"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 Barre de vie"
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
@@ -1304,11 +1090,11 @@ msgstr "Ramasser"
 msgid "Add to chat"
 msgstr "@@chat|Ajouter à la conversation@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr "Entreposer"
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr "Récupérer"
 
@@ -1380,49 +1166,49 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe sont différents"
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Choisissez le serveur"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Serveur :"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr "Port :"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 #, fuzzy
 msgid "Server type:"
 msgstr "Serveur :"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 #, fuzzy
 msgid "Connect"
 msgstr "Connexion..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 #, fuzzy
 msgid "Custom Server"
 msgstr "Curseur personnalisé"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 msgid "Please type both the address and the port of a server."
 msgstr "Veuillez entrer l'adresse et le port du serveur."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Attente du serveur"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr ""
 
@@ -1459,54 +1245,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "Voilà à quoi ressemble cette couleur"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 #, fuzzy
 msgid "Type:"
 msgstr "Type : "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "Statique"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "Impulsion"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr "Arc-en-ciel"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr "Spectre"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 #, fuzzy
 msgid "Delay:"
 msgstr "Retardé : "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 #, fuzzy
 msgid "Red:"
 msgstr "Rouge : "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 #, fuzzy
 msgid "Green:"
 msgstr "Vert : "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 #, fuzzy
 msgid "Blue:"
 msgstr "Bleu : "
@@ -1552,10 +1338,15 @@ msgid "Assign"
 msgstr "Assigner"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Assigner"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Par défaut"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "Conflit(s) de touche détecté"
 
@@ -1632,6 +1423,10 @@ msgstr "Grand"
 msgid "No text"
 msgstr "Pas de texte"
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "Texte"
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Bulles, sans noms"
@@ -1794,220 +1589,220 @@ msgstr "Paramètres d'effet de particules changés."
 msgid "Changes will take effect on map change."
 msgstr "Les changements seront appliqués au changement de carte."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Compétences"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr "Augmenter"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Points de compétences : %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Points de compétences : %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Compétences"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Niveau : %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Guilde créée."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Créer une Guilde"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Êtes-vous sûr de vouloir sortir ?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Invite un utilisateur dans un groupe"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Invite un utilisateur dans un groupe"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Êtes-vous sûr de vouloir sortir ?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr "Créer une Guilde"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 #, fuzzy
 msgid "Create Party"
 msgstr "Création du personnage"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 #, fuzzy
 msgid "Invite"
 msgstr "Inviter un utilisateur"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 #, fuzzy
 msgid "Leave"
 msgstr "Grand"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation refusée de la part de %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation refusée de la part de %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Erreur lors de la création de la guilde."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 #, fuzzy
 msgid "Guild Name"
 msgstr "Guilde"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Choisissez le serveur"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr ""
 "Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vous a invité à rejoindre le groupe %s."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr ""
 "Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s vous a invité à rejoindre son groupe."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s vous a invité à rejoindre le groupe %s."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vous a invité à rejoindre son groupe."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vous a invité à rejoindre le groupe %s."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
 msgid "Party Name"
 msgstr "Groupe"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Choisissez le serveur"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
@@ -2021,25 +1816,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr "Argent : %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr "Vie :"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr "Exp :"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr "PM :"
 
@@ -2092,7 +1887,7 @@ msgstr "Points de compétences : %d"
 msgid "Level"
 msgstr "Niveau : %d"
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "Stockage"
 
@@ -2317,11 +2112,11 @@ msgstr ""
 "Cette commande active l'enregistrement de la conversation dans le fichier "
 "<filename>."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Statut"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Raccourcis"
 
@@ -2527,7 +2322,7 @@ msgstr "Ignorer l'entrée 1"
 msgid "Ignore input 2"
 msgstr "Ignorer l'entrée 2"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2535,13 +2330,13 @@ msgid ""
 msgstr ""
 "Trouver une solution ou des choses étranges se produiront pendant la partie."
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr "Impossible de ramasser l'objet."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2879,6 +2674,10 @@ msgstr "% Esquive :"
 msgid "% Critical"
 msgstr "Coup critique"
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Guilde"
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Affiche cette aide."
@@ -2947,6 +2746,10 @@ msgstr "Réponse d'invitation de %s inconnue."
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Groupe"
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invite un joueur à rejoindre votre groupe"
@@ -3800,10 +3603,154 @@ msgid "Unknown item"
 msgstr "Objet inconnu"
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr "anonyme"
 
+#~ msgid "Text Shadow"
+#~ msgstr "Ombre du texte"
+
+#~ msgid "Text Outline"
+#~ msgstr "Bordure du texte"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Texte des barres de progression"
+
+#~ msgid "Background"
+#~ msgstr "Arrière-plan"
+
+#~ msgid "Highlight"
+#~ msgstr "Surbrillance"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Onglet mis en surbrillance"
+
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Objet trop cher"
+
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "L'objet est équipé"
+
+#~ msgid "GM"
+#~ msgstr "MJ"
+
+#~ msgid "Player"
+#~ msgstr "Joueur"
+
+#~ msgid "Whisper"
+#~ msgstr "Message privé"
+
+#~ msgid "Is"
+#~ msgstr "Est"
+
+#~ msgid "Server"
+#~ msgstr "Serveur"
+
+#~ msgid "Logger"
+#~ msgstr "Historique"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Lien"
+
+#~ msgid "Being"
+#~ msgstr "Forme de vie"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Nom des autres joueurs"
+
+#~ msgid "Own Name"
+#~ msgstr "Mon nom"
+
+#~ msgid "GM Names"
+#~ msgstr "Nom des MJ"
+
+#~ msgid "NPCs"
+#~ msgstr "PNJs"
+
+#~ msgid "Monsters"
+#~ msgstr "Monstres"
+
+#~ msgid "Unknown Item Type"
+#~ msgstr "Type inconnu d'objet"
+
+#~ msgid "Generics"
+#~ msgstr "Génériques"
+
+#~ msgid "Hats"
+#~ msgstr "Chapeaux"
+
+#~ msgid "Usables"
+#~ msgstr "Utilisables"
+
+#~ msgid "Shirts"
+#~ msgstr "Chemises"
+
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Armes à une main"
+
+#~ msgid "Pants"
+#~ msgstr "Pantalon"
+
+#~ msgid "Shoes"
+#~ msgstr "Chaussures"
+
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Armes à une main"
+
+#~ msgid "Shields"
+#~ msgstr "Boucliers"
+
+#~ msgid "Rings"
+#~ msgstr "Anneaux"
+
+#~ msgid "Necklaces"
+#~ msgstr "Colliers"
+
+#~ msgid "Arms"
+#~ msgstr "Bras"
+
+#~ msgid "Ammo"
+#~ msgstr "Munitions"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Effets de particules"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "Information de récupération"
+
+#~ msgid "Exp Notification"
+#~ msgstr "Information d'expérience"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Le joueur touche le monstre"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Le monstre touche le joueur"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Coup critique"
+
+#~ msgid "Misses"
+#~ msgstr "Coups manqués"
+
+#~ msgid "HP Bar"
+#~ msgstr "Barre de vie (niveau maximum)"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 Barre de vie"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 Barre de vie"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 Barre de vie"
+
 #~ msgid "no"
 #~ msgstr "non"
 
diff --git a/po/hr.po b/po/hr.po
index 855a72b0..9a2e3881 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,98 +7,98 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: 2009-12-13 09:30+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Spajanje na poslužitelja karti..."
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 #, fuzzy
 msgid "Logging in"
 msgstr "Korisničko ime"
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Odaberi lika"
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Spajanje na poslužitelja karti..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr "Greška"
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 #, fuzzy
 msgid "Password Change"
 msgstr "Lozinka"
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 #, fuzzy
 msgid "Email Change"
 msgstr "Izmijeni"
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Član je uspješno unaprijeđen."
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Odjavi"
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr ""
 
@@ -535,25 +535,25 @@ msgstr "Cijena: %s / Ukupno: %s"
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Izlaz"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr "Max"
 
@@ -571,7 +571,7 @@ msgstr "Prodaj"
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Poništi"
@@ -672,7 +672,7 @@ msgid "Hair style:"
 msgstr "Frizura:"
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr "Stvori"
 
@@ -728,7 +728,7 @@ msgstr "Odjavi"
 msgid "Change Email"
 msgstr "Promijeni Email Adresu"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Obriši"
@@ -742,7 +742,7 @@ msgstr "Zatvori"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr "Chat"
 
@@ -817,12 +817,12 @@ msgstr "Detalji Čestica"
 msgid "Ambient FX: %s"
 msgstr "Efekti okruženja"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Oprema"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "Skini opremu"
@@ -831,47 +831,47 @@ msgstr "Skini opremu"
 msgid "Help"
 msgstr "Pomoć"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Zatvori"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Zalihe"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Opremi"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Upotrijebi"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 #, fuzzy
 msgid "Drop..."
 msgstr "Ispusti"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Razdvoji"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr "Mjesta:"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr "Težina:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Ispusti"
 
@@ -983,220 +983,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Skini opremu"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Tekst"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Sjena Teksta"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Obris Teksta"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "Progress Bar Oznake"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Pozadina"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Istakni"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Istakni Karticu"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Preskup predmet"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Predmet je opremljen"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Igrač"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Šapat"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "Je"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Partija"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Ceh"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Server"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Hiperveza"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "Biće"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Imena Drugih Igrača"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Vlastito Ime"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "GM Imena"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCs"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Čudovišta"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Nepoznat Tip Predmeta"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Generički"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Šeširi"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Košulje"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "1 Ručno Oružje"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Hlače"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Cipele"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "1 Ručno Oružje"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Štitovi"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Prstenovi"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Ogrlice"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Naoružanje"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Streljivo"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Efekti Čestica"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "Obavijest Sakupljanja"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "Exp Obavijest"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "Igrač pogađa Čudovište"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Čudovište pogađa Igrača"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Kritični Udarac"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Promašaji"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "HP Bar"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 HP Bar"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 HP Bar"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 HP Bar"
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
@@ -1282,11 +1068,11 @@ msgstr "Pokupi"
 msgid "Add to chat"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr "Preuzmi"
 
@@ -1358,49 +1144,49 @@ msgstr "Lozinka mora biti kraća od %d znakova."
 msgid "Passwords do not match."
 msgstr "Lozinke se ne podudaraju."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Izaberite vaš server"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Poslužitelj:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 #, fuzzy
 msgid "Server type:"
 msgstr "Poslužitelj:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 #, fuzzy
 msgid "Connect"
 msgstr "Spajanje..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 #, fuzzy
 msgid "Custom Server"
 msgstr "Vlastiti kursor"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 msgid "Please type both the address and the port of a server."
 msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Čekanje servera"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr ""
 
@@ -1437,54 +1223,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "Ovako izgleda boja"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr "Boje"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 #, fuzzy
 msgid "Type:"
 msgstr "Tip: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "Statično"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "Pulsiranje"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr "Duga"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr "Spektar"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 #, fuzzy
 msgid "Delay:"
 msgstr "Odgoda: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 #, fuzzy
 msgid "Red:"
 msgstr "Crvena: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 #, fuzzy
 msgid "Green:"
 msgstr "Zelena: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 #, fuzzy
 msgid "Blue:"
 msgstr "Plava: "
@@ -1530,10 +1316,15 @@ msgid "Assign"
 msgstr "Dodijeli"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Dodijeli"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Zadano"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "Otkriven je Konflikt(i) Tipki."
 
@@ -1610,6 +1401,10 @@ msgstr "Veliko"
 msgid "No text"
 msgstr "Nema teksta"
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "Tekst"
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Mjehurići, bez imena"
@@ -1768,218 +1563,218 @@ msgstr "Postavke efekta čestica su promijenjene."
 msgid "Changes will take effect on map change."
 msgstr "Promjene će stupiti na snagu na promjeni karte."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Vještine"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr "Gore"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Bodovi vještine: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Bodovi vještine: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Vještine"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Nivo: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Ceh, ustanovljen."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Formiraj Ceh"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Jeste li sigurni da želite odustati?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Pozovite korisnike na partiju"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Pozovite korisnike na partiju"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Jeste li sigurni da želite odustati?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr "Formiraj Ceh"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 #, fuzzy
 msgid "Create Party"
 msgstr "Stvori Lika"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 #, fuzzy
 msgid "Invite"
 msgstr "Pozovi Korisnika"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 #, fuzzy
 msgid "Leave"
 msgstr "Veliko"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Prihvaćen poziv od %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odbijen poziv od %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Prihvaćen poziv od %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odbijen poziv od %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Pogreška pri ustanovljavanju ceha."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 #, fuzzy
 msgid "Guild Name"
 msgstr "Ceh"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Izaberite vaš server"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
 msgid "Party Name"
 msgstr "Partija"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Izaberite vaš server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
@@ -1993,25 +1788,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr "Novac: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr "MP:"
 
@@ -2064,7 +1859,7 @@ msgstr "Bodovi vještine: %d"
 msgid "Level"
 msgstr "Nivo: %d"
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "Pohrana"
 
@@ -2282,11 +2077,11 @@ msgstr "Ova naredba prikazuje broj igrača trenutno online."
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Ova naredba započinje snimanje chat log-a u datoteku <filename>."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Stanje"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Kratica"
 
@@ -2492,20 +2287,20 @@ msgstr ""
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2835,6 +2630,10 @@ msgstr "% Izbjegavanje:"
 msgid "% Critical"
 msgstr "Kritični Udarac"
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Ceh"
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Prikaži ovu pomoć."
@@ -2902,6 +2701,10 @@ msgstr ""
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Partija"
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Pozovite igrače na vašu partiju"
@@ -3727,10 +3530,148 @@ msgid "Unknown item"
 msgstr "Nepoznati predmet"
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr "neimenovano"
 
+#~ msgid "Text Shadow"
+#~ msgstr "Sjena Teksta"
+
+#~ msgid "Text Outline"
+#~ msgstr "Obris Teksta"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Progress Bar Oznake"
+
+#~ msgid "Background"
+#~ msgstr "Pozadina"
+
+#~ msgid "Highlight"
+#~ msgstr "Istakni"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Istakni Karticu"
+
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Preskup predmet"
+
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Predmet je opremljen"
+
+#~ msgid "GM"
+#~ msgstr "GM"
+
+#~ msgid "Player"
+#~ msgstr "Igrač"
+
+#~ msgid "Whisper"
+#~ msgstr "Šapat"
+
+#~ msgid "Is"
+#~ msgstr "Je"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Hiperveza"
+
+#~ msgid "Being"
+#~ msgstr "Biće"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Imena Drugih Igrača"
+
+#~ msgid "Own Name"
+#~ msgstr "Vlastito Ime"
+
+#~ msgid "GM Names"
+#~ msgstr "GM Imena"
+
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
+
+#~ msgid "Monsters"
+#~ msgstr "Čudovišta"
+
+#~ msgid "Unknown Item Type"
+#~ msgstr "Nepoznat Tip Predmeta"
+
+#~ msgid "Generics"
+#~ msgstr "Generički"
+
+#~ msgid "Hats"
+#~ msgstr "Šeširi"
+
+#~ msgid "Shirts"
+#~ msgstr "Košulje"
+
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "1 Ručno Oružje"
+
+#~ msgid "Pants"
+#~ msgstr "Hlače"
+
+#~ msgid "Shoes"
+#~ msgstr "Cipele"
+
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "1 Ručno Oružje"
+
+#~ msgid "Shields"
+#~ msgstr "Štitovi"
+
+#~ msgid "Rings"
+#~ msgstr "Prstenovi"
+
+#~ msgid "Necklaces"
+#~ msgstr "Ogrlice"
+
+#~ msgid "Arms"
+#~ msgstr "Naoružanje"
+
+#~ msgid "Ammo"
+#~ msgstr "Streljivo"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Efekti Čestica"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "Obavijest Sakupljanja"
+
+#~ msgid "Exp Notification"
+#~ msgstr "Exp Obavijest"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Igrač pogađa Čudovište"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Čudovište pogađa Igrača"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Kritični Udarac"
+
+#~ msgid "Misses"
+#~ msgstr "Promašaji"
+
+#~ msgid "HP Bar"
+#~ msgstr "HP Bar"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 HP Bar"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 HP Bar"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 HP Bar"
+
 #~ msgid "no"
 #~ msgstr "ne"
 
diff --git a/po/hu.po b/po/hu.po
index c0ed86b9..2a629598 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: 2009-07-07 19:52+0000\n"
 "Last-Translator: Tatsukichi <artit91@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -18,86 +18,86 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Beállítások"
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Csatlakozás a térkép szerverhez...."
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 #, fuzzy
 msgid "Logging in"
 msgstr "Belépés"
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Csatlakozás a térkép szerverhez...."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr "Hiba"
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 #, fuzzy
 msgid "Password Change"
 msgstr "Jelszó:"
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 #, fuzzy
 msgid "Email Change"
 msgstr "Változtatás"
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "A tag előléptetése sikeres."
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Regisztráció megszüntetése"
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Helytelen frissítési kiszolgáló: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
@@ -549,25 +549,25 @@ msgstr "Ár: %s / Teljes: %s"
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Kilépés"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr "Max."
 
@@ -585,7 +585,7 @@ msgstr "Eladás"
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Mégse"
@@ -686,7 +686,7 @@ msgid "Hair style:"
 msgstr "Haj stílus:"
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr "Létrehozás"
 
@@ -742,7 +742,7 @@ msgstr "Regisztráció megszüntetése"
 msgid "Change Email"
 msgstr "Email cím módosírása"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Törlés"
@@ -756,7 +756,7 @@ msgstr "Bezár"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr "Chat"
 
@@ -831,12 +831,12 @@ msgstr "Effektek részletessége"
 msgid "Ambient FX: %s"
 msgstr "Környezeti effektek"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Felszerelés"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "Nem használ"
@@ -845,47 +845,47 @@ msgstr "Nem használ"
 msgid "Help"
 msgstr "Súgó"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Bezár"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Táska"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Használ"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Bevet"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 #, fuzzy
 msgid "Drop..."
 msgstr "Eldob"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Felosztás"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr "Hely:"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr "Súly:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Eldob"
 
@@ -997,220 +997,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Nem használ"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Szöveg"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Szövegárnyék"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Szöveg körvonala"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "Töltésjelző cimkék"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Háttér"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Kijelölt"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Kijelölt fül"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "A tárgy túl drága"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "A tárgy használatban van"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Játékos"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Privát üzenet"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "Is"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Csapat"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Klán"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Szerver"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "Rögzítő"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Hiperlink"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "Nevek"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Ismeretlen játékos neve"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Saját név"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "GM név"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "Gépjátékos neve"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Szörny neve"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Ismeretlen tárgy típus"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Gyógyszer"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Fejfedő"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "Bevethető"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Felső"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "1 kezes fegyverek"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Nadrág"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Cipő"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "1 kezes fegyverek"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Pajzsok"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Gyűrűk"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Nyaklánc"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Kezek"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Töltény"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Effektek"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "Tárgy felvételekor"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "Tapasztalat szerzésekor"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "Sebzéskor"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Sérüléskor"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Kritikális ütéskor"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Ha nincs találat."
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "Élet csík"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 élet csík"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 élet csík"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 Élet csík"
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
@@ -1296,11 +1082,11 @@ msgstr "Felvesz"
 msgid "Add to chat"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr "Magához vesz"
 
@@ -1372,49 +1158,49 @@ msgstr "A jelszónak legfeljebb %d karakter hosszúnak kell lennie."
 msgid "Passwords do not match."
 msgstr "A jelszavak nem egyeznek."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Válassz szervert"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Szerver:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 #, fuzzy
 msgid "Server type:"
 msgstr "Szerver:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 #, fuzzy
 msgid "Connect"
 msgstr "Csatlakozás…"
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 #, fuzzy
 msgid "Custom Server"
 msgstr "Egyéni kurzor"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 msgid "Please type both the address and the port of a server."
 msgstr "Kérlek írd be a szerver címét és portját egyaránt."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Várakozás a szerverre"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr ""
 
@@ -1451,54 +1237,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "Így fog kinézni a felirat."
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr "Színek"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 #, fuzzy
 msgid "Type:"
 msgstr "Típus: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "Statikus"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "Pulzáló"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr "Szivárvány"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr "Színkép"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 #, fuzzy
 msgid "Delay:"
 msgstr "Várakozás "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 #, fuzzy
 msgid "Red:"
 msgstr "Vörös: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 #, fuzzy
 msgid "Green:"
 msgstr "Zöld: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 #, fuzzy
 msgid "Blue:"
 msgstr "Kék: "
@@ -1544,10 +1330,15 @@ msgid "Assign"
 msgstr "Hozzárendel"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Hozzárendel"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "Billentyű ütközés van."
 
@@ -1624,6 +1415,10 @@ msgstr "Nagy"
 msgid "No text"
 msgstr "Nincs szöveg"
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "Szöveg"
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Buborékok, nincs név."
@@ -1784,218 +1579,218 @@ msgstr "Effektek beállítása megváltozott."
 msgid "Changes will take effect on map change."
 msgstr "A változások érvénybe lépéséhez töltsön be egy új térképet."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Képességek"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr "Fejleszt"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Képesség pontok: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Képesség pontok: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Képességek"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Szint: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Szint: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Klán létrehozva."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Klán létrehozása"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Biztos, hogy ki szeretne lépni?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Felhasználó csapatba hívása"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Felhasználó csapatba hívása"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Biztos, hogy ki szeretne lépni?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr "Klán létrehozása"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 #, fuzzy
 msgid "Create Party"
 msgstr "Karakter létrehozása"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 #, fuzzy
 msgid "Invite"
 msgstr "Felhasználó meghívása"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 #, fuzzy
 msgid "Leave"
 msgstr "Nagy"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Csapatba hívást elfogadta %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Csapatba hívást elutasította %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Csapatba hívást elfogadta %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Csapatba hívást elutasította %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Hiba a klán létrehozása közben."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 #, fuzzy
 msgid "Guild Name"
 msgstr "Klán"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Válassz szervert"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Csapatba hívtak, de neked van csapatod."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Ajánlat elfogadása"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr "Csapatba hívtak, de neked van csapatod."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s a csapatába hívott."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s a csapatába hívott."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr "Ajánlat elfogadása"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
 msgid "Party Name"
 msgstr "Csapat"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Válassz szervert"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
@@ -2009,25 +1804,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr "Szint: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr "Pénz: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr "Élet:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr "TP:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr "Varázserő:"
 
@@ -2080,7 +1875,7 @@ msgstr "Képesség pontok: %d"
 msgid "Level"
 msgstr "Szint: %d"
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "Raktár"
 
@@ -2302,11 +2097,11 @@ msgstr ""
 "Ez a parancs elkezdi felvenni a beszélgetést a <fájlnév> alatt megadott "
 "fájlba."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Státusz"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Gyorsmenü"
 
@@ -2512,20 +2307,20 @@ msgstr "Ignore input 1"
 msgid "Ignore input 2"
 msgstr "Ignore input 2"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Állítsd át, vagy a játék érdekesen fog viselkedni."
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr "Nem tudod felvenni a tárgyat."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2856,6 +2651,10 @@ msgstr "Kitérés (%):"
 msgid "% Critical"
 msgstr "Kritikális ütéskor"
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Klán"
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Megmutatja ezt a súgót."
@@ -2924,6 +2723,10 @@ msgstr "%s részéről ismeretlen válasz a meghívásra."
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Csapat"
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Játékos meghívása a csapatba"
@@ -3759,10 +3562,154 @@ msgid "Unknown item"
 msgstr "Ismeretlen tárgy"
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr "Névtelen"
 
+#~ msgid "Text Shadow"
+#~ msgstr "Szövegárnyék"
+
+#~ msgid "Text Outline"
+#~ msgstr "Szöveg körvonala"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Töltésjelző cimkék"
+
+#~ msgid "Background"
+#~ msgstr "Háttér"
+
+#~ msgid "Highlight"
+#~ msgstr "Kijelölt"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Kijelölt fül"
+
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "A tárgy túl drága"
+
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "A tárgy használatban van"
+
+#~ msgid "GM"
+#~ msgstr "GM"
+
+#~ msgid "Player"
+#~ msgstr "Játékos"
+
+#~ msgid "Whisper"
+#~ msgstr "Privát üzenet"
+
+#~ msgid "Is"
+#~ msgstr "Is"
+
+#~ msgid "Server"
+#~ msgstr "Szerver"
+
+#~ msgid "Logger"
+#~ msgstr "Rögzítő"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Hiperlink"
+
+#~ msgid "Being"
+#~ msgstr "Nevek"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Ismeretlen játékos neve"
+
+#~ msgid "Own Name"
+#~ msgstr "Saját név"
+
+#~ msgid "GM Names"
+#~ msgstr "GM név"
+
+#~ msgid "NPCs"
+#~ msgstr "Gépjátékos neve"
+
+#~ msgid "Monsters"
+#~ msgstr "Szörny neve"
+
+#~ msgid "Unknown Item Type"
+#~ msgstr "Ismeretlen tárgy típus"
+
+#~ msgid "Generics"
+#~ msgstr "Gyógyszer"
+
+#~ msgid "Hats"
+#~ msgstr "Fejfedő"
+
+#~ msgid "Usables"
+#~ msgstr "Bevethető"
+
+#~ msgid "Shirts"
+#~ msgstr "Felső"
+
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "1 kezes fegyverek"
+
+#~ msgid "Pants"
+#~ msgstr "Nadrág"
+
+#~ msgid "Shoes"
+#~ msgstr "Cipő"
+
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "1 kezes fegyverek"
+
+#~ msgid "Shields"
+#~ msgstr "Pajzsok"
+
+#~ msgid "Rings"
+#~ msgstr "Gyűrűk"
+
+#~ msgid "Necklaces"
+#~ msgstr "Nyaklánc"
+
+#~ msgid "Arms"
+#~ msgstr "Kezek"
+
+#~ msgid "Ammo"
+#~ msgstr "Töltény"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Effektek"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "Tárgy felvételekor"
+
+#~ msgid "Exp Notification"
+#~ msgstr "Tapasztalat szerzésekor"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Sebzéskor"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Sérüléskor"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Kritikális ütéskor"
+
+#~ msgid "Misses"
+#~ msgstr "Ha nincs találat."
+
+#~ msgid "HP Bar"
+#~ msgstr "Élet csík"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 élet csík"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 élet csík"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 Élet csík"
+
 #~ msgid "no"
 #~ msgstr "Nem"
 
diff --git a/po/it.po b/po/it.po
index 9b043367..50bbd61e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: 2010-02-18 14:01+0000\n"
 "Last-Translator: Gabriel Rota <gabriel.rota@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -20,85 +20,85 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Connessione al server della mappa..."
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 #, fuzzy
 msgid "Logging in"
 msgstr "Autenticazione"
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Scelta Personaggio"
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Connessione al server della mappa..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr "Errore"
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 #, fuzzy
 msgid "Password Change"
 msgstr "Password:"
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 #, fuzzy
 msgid "Email Change"
 msgstr "Cambia"
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Cancella registrazione"
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Host di aggiornamento non valido: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
@@ -545,25 +545,25 @@ msgstr "Prezzo: %s / Totale: %s"
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Esci"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr "Massimo"
 
@@ -581,7 +581,7 @@ msgstr "Vendi"
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Annulla"
@@ -682,7 +682,7 @@ msgid "Hair style:"
 msgstr "Stile Capelli:"
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr "Crea"
 
@@ -738,7 +738,7 @@ msgstr "Cancella registrazione"
 msgid "Change Email"
 msgstr "Cambia l'indirizzo Email"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Elimina"
@@ -752,7 +752,7 @@ msgstr "Chiudi"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr "Chat"
 
@@ -827,12 +827,12 @@ msgstr "Dettagli particelle"
 msgid "Ambient FX: %s"
 msgstr "Suoni ambientali"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "Rimuovi"
@@ -841,47 +841,47 @@ msgstr "Rimuovi"
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Equipaggia"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Usa"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 #, fuzzy
 msgid "Drop..."
 msgstr "Lascia"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Dividi"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr "Slot:"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Lascia"
 
@@ -993,220 +993,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Rimuovi"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Testo"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Ombra del testo"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Contorno del testo"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "Etichetta della barra di progresso"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Sfondo"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Evidenziazione"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Evidenziazione scheda"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "L'oggetto è troppo costoso"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "L'oggetto è equipaggiato"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Giocatore"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Sussurro"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "è"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Party"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Gilda"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Server"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Collegamento ipertestuale"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "Essere"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Nomi degli altri giocatori"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Proprio nome"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "Nomi dei GM"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCs"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Mostri"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Tipo di oggetto sconosciuto"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Generici"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Cappelli"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "Utilizzabili"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Magliette"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "Armi da mano singola"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Pantaloni"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Scarpe"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "Armi da mano singola"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Scudi"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Anelli"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Collane"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Armi"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Munizioni"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Effetti particelle"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "Notifica Esperienza"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "Il giocatore colpisce il mostro"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Il mostro colpisce il giocatore"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Colpo critico"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Perde"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "Barra HP"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 della barra degli HP"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 della barra degli HP"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 della barra degli HP"
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
@@ -1292,11 +1078,11 @@ msgstr "Raccogli"
 msgid "Add to chat"
 msgstr "@@chat|Aggiungi alla chat@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr "Recupera"
 
@@ -1368,49 +1154,49 @@ msgstr "La password deve contenere meno di %d caratteri."
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Scegliere il proprio server"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 #, fuzzy
 msgid "Connect"
 msgstr "Connessione..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 #, fuzzy
 msgid "Custom Server"
 msgstr "Cursore personalizzato"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 msgid "Please type both the address and the port of a server."
 msgstr "Per favore inserisci l'indirizzo e la porta del server."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "In attesa del server"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr ""
 
@@ -1447,54 +1233,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "Come appaiono i colori"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr "Colori"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 #, fuzzy
 msgid "Type:"
 msgstr "Tipo: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "Statico"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "Pulsazione"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr "Arcobaleno"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr "Gamma"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 #, fuzzy
 msgid "Delay:"
 msgstr "Ritardo: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 #, fuzzy
 msgid "Red:"
 msgstr "Rosso: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 #, fuzzy
 msgid "Green:"
 msgstr "Verde: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 #, fuzzy
 msgid "Blue:"
 msgstr "Blu: "
@@ -1540,10 +1326,15 @@ msgid "Assign"
 msgstr "Imposta"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Imposta"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Predefinito"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "Sono stati rilevati conflitti nei tasti."
 
@@ -1620,6 +1411,10 @@ msgstr "Largo"
 msgid "No text"
 msgstr "Nessun testo"
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "Testo"
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Nuvolette senza nomi"
@@ -1780,218 +1575,218 @@ msgstr "Impostazione effetti particelle modificato."
 msgid "Changes will take effect on map change."
 msgstr "I cambi saranno effettuati al cambio della mappa."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Abilità"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr "Su"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Punti abilità: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Punti abilità: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Abilità"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Livello: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Livello: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "La gilda è stata creata."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Crea una Gilda"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Sei sicuro di voler uscire?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Invita un utente nel party"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Invita un utente nel party"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Sei sicuro di voler uscire?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr "Crea una Gilda"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 #, fuzzy
 msgid "Create Party"
 msgstr "Crea Personaggio"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 #, fuzzy
 msgid "Invite"
 msgstr "Invita un utente"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 #, fuzzy
 msgid "Leave"
 msgstr "Largo"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invito accettato da %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invito rifiutato da %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invito accettato da %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invito rifiutato da %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Errore durante la creazione della gilda."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 #, fuzzy
 msgid "Guild Name"
 msgstr "Gilda"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Scegliere il proprio server"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s ti ha invitato ad unirti al suo party."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s ti ha invitato ad unirti al suo party."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
 msgid "Party Name"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Scegliere il proprio server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
@@ -2005,25 +1800,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr "Soldi: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr "Esperienza:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr "MP:"
 
@@ -2076,7 +1871,7 @@ msgstr "Punti abilità: %d"
 msgid "Level"
 msgstr "Livello: %d"
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "Storage"
 
@@ -2298,11 +2093,11 @@ msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Questo comando attiva la registrazione della chat nel file <nome file>"
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Stato"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Scorciatoia"
 
@@ -2508,7 +2303,7 @@ msgstr "Ignora input 1"
 msgid "Ignore input 2"
 msgstr "Ignora input 2"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2516,13 +2311,13 @@ msgid ""
 msgstr ""
 "Se non vengono risolti, il gioco potrebbe comportarsi in modo inaspettato."
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr "Impossibile raccogliere l'oggetto."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2853,6 +2648,10 @@ msgstr "% Evasione:"
 msgid "% Critical"
 msgstr "Colpo critico"
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Gilda"
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Mostra questo messaggio di aiuto"
@@ -2920,6 +2719,10 @@ msgstr ""
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Party"
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invita un giocatore al tuo party"
@@ -3751,10 +3554,148 @@ msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr ""
 
+#~ msgid "Text Shadow"
+#~ msgstr "Ombra del testo"
+
+#~ msgid "Text Outline"
+#~ msgstr "Contorno del testo"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Etichetta della barra di progresso"
+
+#~ msgid "Background"
+#~ msgstr "Sfondo"
+
+#~ msgid "Highlight"
+#~ msgstr "Evidenziazione"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Evidenziazione scheda"
+
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "L'oggetto è troppo costoso"
+
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "L'oggetto è equipaggiato"
+
+#~ msgid "GM"
+#~ msgstr "GM"
+
+#~ msgid "Player"
+#~ msgstr "Giocatore"
+
+#~ msgid "Whisper"
+#~ msgstr "Sussurro"
+
+#~ msgid "Is"
+#~ msgstr "è"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Collegamento ipertestuale"
+
+#~ msgid "Being"
+#~ msgstr "Essere"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Nomi degli altri giocatori"
+
+#~ msgid "Own Name"
+#~ msgstr "Proprio nome"
+
+#~ msgid "GM Names"
+#~ msgstr "Nomi dei GM"
+
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
+
+#~ msgid "Monsters"
+#~ msgstr "Mostri"
+
+#~ msgid "Unknown Item Type"
+#~ msgstr "Tipo di oggetto sconosciuto"
+
+#~ msgid "Generics"
+#~ msgstr "Generici"
+
+#~ msgid "Hats"
+#~ msgstr "Cappelli"
+
+#~ msgid "Usables"
+#~ msgstr "Utilizzabili"
+
+#~ msgid "Shirts"
+#~ msgstr "Magliette"
+
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Armi da mano singola"
+
+#~ msgid "Pants"
+#~ msgstr "Pantaloni"
+
+#~ msgid "Shoes"
+#~ msgstr "Scarpe"
+
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Armi da mano singola"
+
+#~ msgid "Shields"
+#~ msgstr "Scudi"
+
+#~ msgid "Rings"
+#~ msgstr "Anelli"
+
+#~ msgid "Necklaces"
+#~ msgstr "Collane"
+
+#~ msgid "Arms"
+#~ msgstr "Armi"
+
+#~ msgid "Ammo"
+#~ msgstr "Munizioni"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Effetti particelle"
+
+#~ msgid "Exp Notification"
+#~ msgstr "Notifica Esperienza"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Il giocatore colpisce il mostro"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Il mostro colpisce il giocatore"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Colpo critico"
+
+#~ msgid "Misses"
+#~ msgstr "Perde"
+
+#~ msgid "HP Bar"
+#~ msgstr "Barra HP"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 della barra degli HP"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 della barra degli HP"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 della barra degli HP"
+
 #~ msgid "no"
 #~ msgstr "no"
 
diff --git a/po/mana.pot b/po/mana.pot
index f8497a15..7c5d2ec8 100644
--- a/po/mana.pot
+++ b/po/mana.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,78 +17,78 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr ""
 
@@ -509,25 +509,25 @@ msgstr ""
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr ""
 
@@ -545,7 +545,7 @@ msgstr ""
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -641,7 +641,7 @@ msgid "Hair style:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr ""
 
@@ -696,7 +696,7 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr ""
@@ -709,7 +709,7 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr ""
 
@@ -784,12 +784,12 @@ msgstr ""
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr ""
@@ -798,46 +798,46 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr ""
 
@@ -945,214 +945,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr ""
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
 #: src/gui/popupmenu.cpp:84
 #, c-format
 msgid "Trade with %s..."
@@ -1234,11 +1026,11 @@ msgstr ""
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr ""
 
@@ -1310,44 +1102,44 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr ""
 
@@ -1383,50 +1175,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 msgid "Blue:"
 msgstr ""
 
@@ -1471,10 +1263,14 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
@@ -1550,6 +1346,10 @@ msgstr ""
 msgid "No text"
 msgstr ""
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr ""
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
@@ -1699,206 +1499,206 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
@@ -1912,25 +1712,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr ""
 
@@ -1977,7 +1777,7 @@ msgstr ""
 msgid "Level"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr ""
 
@@ -2191,11 +1991,11 @@ msgstr ""
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
@@ -2395,20 +2195,20 @@ msgstr ""
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2708,6 +2508,10 @@ msgstr ""
 msgid "% Critical"
 msgstr ""
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
@@ -2768,6 +2572,10 @@ msgstr ""
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
@@ -3551,6 +3359,6 @@ msgid "Unknown item"
 msgstr ""
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 987b7c13..20c50b36 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: 2009-07-15 12:21+0000\n"
 "Last-Translator: Yentl <y.v.t@scarlet.be>\n"
 "Language-Team: Dutch\n"
@@ -18,86 +18,86 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Verbinden met de map server..."
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 #, fuzzy
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Kies Personage"
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Verbinden met de map server..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 #, fuzzy
 msgid "Password Change"
 msgstr "Wachtwoord:"
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 #, fuzzy
 msgid "Email Change"
 msgstr "Veranderen"
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Lid is succesvol gepromoveerd."
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Registreren"
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige updatahost: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
@@ -545,25 +545,25 @@ msgstr "Prijs: %s / Totaal: %s"
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr "Maximum"
 
@@ -581,7 +581,7 @@ msgstr "Verkopen"
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Annuleren"
@@ -682,7 +682,7 @@ msgid "Hair style:"
 msgstr "Haarstijl:"
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -738,7 +738,7 @@ msgstr "Registreren"
 msgid "Change Email"
 msgstr "Emailadres wijzigen"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Verwijderen"
@@ -752,7 +752,7 @@ msgstr "Sluiten"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr "Chat"
 
@@ -827,12 +827,12 @@ msgstr "Deeltjes details"
 msgid "Ambient FX: %s"
 msgstr "Omgevingseffecten"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "Afdoen"
@@ -841,47 +841,47 @@ msgstr "Afdoen"
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Gebruiken"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 #, fuzzy
 msgid "Drop..."
 msgstr "Neerleggen"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Splitsen"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr "Sloten:"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Neerleggen"
 
@@ -993,218 +993,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Afdoen"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Tekst"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Tekstschaduw"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Tekstuitlijning"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "Vooruitgangsbalk Labels"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Achtergrond"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Accentueren"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Tab Accentuering"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Voorwerp te duur"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Voorwerp wordt al gedragen"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Speler"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Fluister"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "is gelijk aan"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Groep"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Guild"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Server"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Hyperlink"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "Wezen"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Namen van andere Spelers"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Eigen Naam"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "GM Namen"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCs"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Monsters"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Onbekend type voorwerp"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Generiek"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Hoeden"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "Gebruiksvoorwerpen"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Shirts"
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Broeken"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Schoenen"
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Schilden"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Ringen"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Kettingen"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Wapens"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Ammunitie"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Deeltjes effecten"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "Notificatie bij opnemen"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "Ervaring Notificatie"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "Speler raakt Monster"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Monster raakt Speler"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Kritieke aanval"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Missers"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "Levensbalk"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 Levensbalk"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 Levensbalk"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 Levensbalk"
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
@@ -1288,11 +1076,11 @@ msgstr "Oprapen"
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr "Afhalen"
 
@@ -1364,49 +1152,49 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Kies jouw server"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 #, fuzzy
 msgid "Connect"
 msgstr "Verbinden..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 #, fuzzy
 msgid "Custom Server"
 msgstr "Aangepaste cursor"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 msgid "Please type both the address and the port of a server."
 msgstr "Typ aub zowel het adres van de server, als de poort."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Wachten op server"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr ""
 
@@ -1443,54 +1231,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "Dit is hoe de kleur eruit ziet"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 #, fuzzy
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "Statisch"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr "Regenboog"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 #, fuzzy
 msgid "Delay:"
 msgstr "Vertraging: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 #, fuzzy
 msgid "Red:"
 msgstr "Rood: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 #, fuzzy
 msgid "Green:"
 msgstr "Groen: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 #, fuzzy
 msgid "Blue:"
 msgstr "Blauw: "
@@ -1536,10 +1324,15 @@ msgid "Assign"
 msgstr "Toewijzen"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Toewijzen"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Standaard"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
@@ -1616,6 +1409,10 @@ msgstr "Groot"
 msgid "No text"
 msgstr "Geen tekst"
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "Tekst"
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Bellen, geen namen"
@@ -1776,218 +1573,218 @@ msgstr "Deeltjes effecten instellingen gewijzigd."
 msgid "Changes will take effect on map change."
 msgstr "Wijzigingen treden in werking bij het wisselen van map."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Vaardigheden"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheidspunten: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Vaardigheden"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Level: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild aangemaakt."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Weet u zeker dat u wilt afsluiten?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Een gebruiker uitnodigen in de groep"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Een gebruiker uitnodigen in de groep"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Weet u zeker dat u wilt afsluiten?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 #, fuzzy
 msgid "Create Party"
 msgstr "Personage Aanmaken"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 #, fuzzy
 msgid "Invite"
 msgstr "Gebruiker uitnodigen"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 #, fuzzy
 msgid "Leave"
 msgstr "Groot"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging van %s aanvaard."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging van %s geweigerd."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging van %s aanvaard."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging van %s geweigerd."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Fout bij het creëren van guild."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 #, fuzzy
 msgid "Guild Name"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Kies jouw server"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
 msgid "Party Name"
 msgstr "Groep"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Kies jouw server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
@@ -2001,25 +1798,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr "Leven:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr "Ervaring:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr "Magie:"
 
@@ -2072,7 +1869,7 @@ msgstr "Vaardigheidspunten: %d"
 msgid "Level"
 msgstr "Level: %d"
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "Opslag"
 
@@ -2297,11 +2094,11 @@ msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Dit commando begint de chat log op te slaan naar het bestand <bestandsnaam>."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Sneltoets"
 
@@ -2507,20 +2304,20 @@ msgstr "Ingave 1 negeren"
 msgid "Ignore input 2"
 msgstr "Ingave 2 negeren"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Los deze problemen op, of het spel kan raar gedrag vertonen."
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr "Kan het voorwerp niet oprapen."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2851,6 +2648,10 @@ msgstr "% Ontwijking:"
 msgid "% Critical"
 msgstr "Kritieke aanval"
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Guild"
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Geeft deze help weer."
@@ -2919,6 +2720,10 @@ msgstr "Onbekend uitnodigingsantwoord van %s."
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Groep"
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Nodig een speler uit voor jouw groep"
@@ -3761,10 +3566,143 @@ msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr "naamloos"
 
+#~ msgid "Text Shadow"
+#~ msgstr "Tekstschaduw"
+
+#~ msgid "Text Outline"
+#~ msgstr "Tekstuitlijning"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Vooruitgangsbalk Labels"
+
+#~ msgid "Background"
+#~ msgstr "Achtergrond"
+
+#~ msgid "Highlight"
+#~ msgstr "Accentueren"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Tab Accentuering"
+
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Voorwerp te duur"
+
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Voorwerp wordt al gedragen"
+
+#~ msgid "GM"
+#~ msgstr "GM"
+
+#~ msgid "Player"
+#~ msgstr "Speler"
+
+#~ msgid "Whisper"
+#~ msgstr "Fluister"
+
+#~ msgid "Is"
+#~ msgstr "is gelijk aan"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Hyperlink"
+
+#~ msgid "Being"
+#~ msgstr "Wezen"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Namen van andere Spelers"
+
+#~ msgid "Own Name"
+#~ msgstr "Eigen Naam"
+
+#~ msgid "GM Names"
+#~ msgstr "GM Namen"
+
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
+
+#~ msgid "Monsters"
+#~ msgstr "Monsters"
+
+#~ msgid "Unknown Item Type"
+#~ msgstr "Onbekend type voorwerp"
+
+#~ msgid "Generics"
+#~ msgstr "Generiek"
+
+#~ msgid "Hats"
+#~ msgstr "Hoeden"
+
+#~ msgid "Usables"
+#~ msgstr "Gebruiksvoorwerpen"
+
+#~ msgid "Shirts"
+#~ msgstr "Shirts"
+
+#~ msgid "Pants"
+#~ msgstr "Broeken"
+
+#~ msgid "Shoes"
+#~ msgstr "Schoenen"
+
+#~ msgid "Shields"
+#~ msgstr "Schilden"
+
+#~ msgid "Rings"
+#~ msgstr "Ringen"
+
+#~ msgid "Necklaces"
+#~ msgstr "Kettingen"
+
+#~ msgid "Arms"
+#~ msgstr "Wapens"
+
+#~ msgid "Ammo"
+#~ msgstr "Ammunitie"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Deeltjes effecten"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "Notificatie bij opnemen"
+
+#~ msgid "Exp Notification"
+#~ msgstr "Ervaring Notificatie"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Speler raakt Monster"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Monster raakt Speler"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Kritieke aanval"
+
+#~ msgid "Misses"
+#~ msgstr "Missers"
+
+#~ msgid "HP Bar"
+#~ msgstr "Levensbalk"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 Levensbalk"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 Levensbalk"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 Levensbalk"
+
 #~ msgid "no"
 #~ msgstr "nee"
 
diff --git a/po/pl.po b/po/pl.po
index 8d635620..f3057dd6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: 2009-09-14 06:59+0000\n"
 "Last-Translator: Maciej Benke <syngress_stc@vp.pl>\n"
 "Language-Team: <pl@li.org>\n"
@@ -21,86 +21,86 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem map..."
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 #, fuzzy
 msgid "Logging in"
 msgstr "Użytkownik"
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Wybierz postać"
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Łączenie z serwerem map..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr "Błąd"
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 #, fuzzy
 msgid "Password Change"
 msgstr "Hasło:"
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 #, fuzzy
 msgid "Email Change"
 msgstr "Zmień"
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Członek został pomyślnie wypromowany."
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Wyrejestruj"
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Nieprawidłowy host aktualizacji: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
@@ -548,25 +548,25 @@ msgstr "Cena: %s/ Razem: %s"
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr "Maks."
 
@@ -584,7 +584,7 @@ msgstr "Sprzedaj"
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Anuluj"
@@ -685,7 +685,7 @@ msgid "Hair style:"
 msgstr "Fryzura:"
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr "Utwórz"
 
@@ -741,7 +741,7 @@ msgstr "Wyrejestruj"
 msgid "Change Email"
 msgstr "Zmień adres Email"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Usuń"
@@ -755,7 +755,7 @@ msgstr "Zamknij"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr "Czat"
 
@@ -830,12 +830,12 @@ msgstr "Detale cząsteczek"
 msgid "Ambient FX: %s"
 msgstr "Efekty otoczenia"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Ekwipunek"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "Zdejmij"
@@ -844,47 +844,47 @@ msgstr "Zdejmij"
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inwentarz"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Załóż"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Użyj"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 #, fuzzy
 msgid "Drop..."
 msgstr "Upuść"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Podziel"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr "Miejsc:"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr "Waga:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Upuść"
 
@@ -996,220 +996,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Zdejmij"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Tekst"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Cień tekstu"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Kontur Tekstu"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "Etykiety Pasków Postępu"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Tło"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Podświetlenie"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Podświetlenie zakładki"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Przedmiot zbyt drogi"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Przedmiot jest założony"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Gracz"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Szept"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "Jest"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Grupa"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Gildia"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Serwer"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "Logger"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Hiperłącze"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "Byty"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Imiona Innych Graczy"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Własne Imię"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "Imiona GM"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPC"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Potwory"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Nieznany Typ Przedmiotu"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Ogólne"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Kapelusze"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "Użytkowe"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Koszulki"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "Bronie jednoręczne"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Spodnie"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Buty"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "Bronie jednoręczne"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Tarcze"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Pierścienie"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Naszyjniki"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Naramienniki"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Amunicja"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Efekty Cząsteczkowe"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "Powiadomienie o podniesieniu"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "Powiadomienie o Exp"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "Gracz uderza Potwora"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Potwór uderza Gracza"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Uderzenie Krytyczne"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Pudła"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "Pasek HP"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 Paska HP"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 Paska HP"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 Paska HP"
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
@@ -1295,11 +1081,11 @@ msgstr "Podnieś"
 msgid "Add to chat"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr "Pobierz"
 
@@ -1371,49 +1157,49 @@ msgstr "Hasło nie może mieć więcej jak %d znaków."
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Wybierz twój serwer"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Serwer:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 #, fuzzy
 msgid "Server type:"
 msgstr "Serwer:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 #, fuzzy
 msgid "Connect"
 msgstr "Łączenie..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 #, fuzzy
 msgid "Custom Server"
 msgstr "Własny kursor"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 msgid "Please type both the address and the port of a server."
 msgstr "Proszę wpisać adres i port serwera"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Oczekiwanie na serwer"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr ""
 
@@ -1450,54 +1236,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "Kolor będzie wyglądał w ten sposób"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 #, fuzzy
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "Statyczny"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr "Tęcza"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr "Widmo"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 #, fuzzy
 msgid "Delay:"
 msgstr "Opóźnienie: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 #, fuzzy
 msgid "Red:"
 msgstr "Czerwony: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 #, fuzzy
 msgid "Green:"
 msgstr "Zielony: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 #, fuzzy
 msgid "Blue:"
 msgstr "Niebieski: "
@@ -1543,10 +1329,15 @@ msgid "Assign"
 msgstr "Przypisz"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Przypisz"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Domyślny"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "Wykryto konflikt klawiszy."
 
@@ -1623,6 +1414,10 @@ msgstr "Duża"
 msgid "No text"
 msgstr "Brak tekstu"
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "Tekst"
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Bąbelki, brak imion"
@@ -1783,218 +1578,218 @@ msgstr "Zmieniono ustawienia ef. cząsteczek"
 msgid "Changes will take effect on map change."
 msgstr "Efekty nastąpią po zmianie mapy."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Zdolności"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr "Góra"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Punkty umiejętności: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Punkty umiejętności: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Zdolności"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Poziom: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Gildia została utworzona."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Utwórz Gildię"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Czy na pewno chcesz wyjść?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Zaproś użytkownika do grupy"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Zaproś użytkownika do grupy"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Czy na pewno chcesz wyjść?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr "Utwórz Gildię"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 #, fuzzy
 msgid "Create Party"
 msgstr "Stwórz postać"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 #, fuzzy
 msgid "Invite"
 msgstr "Zaproś Użytkownika"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 #, fuzzy
 msgid "Leave"
 msgstr "Duża"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Zaakceptowano zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Błąd podczas tworzenia gildii."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 #, fuzzy
 msgid "Guild Name"
 msgstr "Gildia"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Wybierz twój serwer"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
 msgid "Party Name"
 msgstr "Grupa"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Wybierz twój serwer"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
@@ -2008,25 +1803,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr "Pieniądze: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr "MP:"
 
@@ -2079,7 +1874,7 @@ msgstr "Punkty umiejętności: %d"
 msgid "Level"
 msgstr "Poziom: %d"
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "Magazyn"
 
@@ -2300,11 +2095,11 @@ msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Ta komenda rozpoczyna zapisywanie dziennika czatu to pliku <nazwa_pliku."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Stan"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Skrót"
 
@@ -2510,20 +2305,20 @@ msgstr "Ignoruj wprowadzenie 1"
 msgid "Ignore input 2"
 msgstr "Ignoruj wprowadzenie 2"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Rozwiąż je, albo granie może być utrudnione."
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr "Nie można podnieść przedmiotu."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2855,6 +2650,10 @@ msgstr "% Unik:"
 msgid "% Critical"
 msgstr "Uderzenie Krytyczne"
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Gildia"
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Wyświetla tą pomoc"
@@ -2923,6 +2722,10 @@ msgstr "Nieznana odpowiedź na zaproszenie dla %s"
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Grupa"
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Zaproszenie gracza do twojej grupy"
@@ -3757,10 +3560,154 @@ msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr "nienazwany"
 
+#~ msgid "Text Shadow"
+#~ msgstr "Cień tekstu"
+
+#~ msgid "Text Outline"
+#~ msgstr "Kontur Tekstu"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Etykiety Pasków Postępu"
+
+#~ msgid "Background"
+#~ msgstr "Tło"
+
+#~ msgid "Highlight"
+#~ msgstr "Podświetlenie"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Podświetlenie zakładki"
+
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Przedmiot zbyt drogi"
+
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Przedmiot jest założony"
+
+#~ msgid "GM"
+#~ msgstr "GM"
+
+#~ msgid "Player"
+#~ msgstr "Gracz"
+
+#~ msgid "Whisper"
+#~ msgstr "Szept"
+
+#~ msgid "Is"
+#~ msgstr "Jest"
+
+#~ msgid "Server"
+#~ msgstr "Serwer"
+
+#~ msgid "Logger"
+#~ msgstr "Logger"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Hiperłącze"
+
+#~ msgid "Being"
+#~ msgstr "Byty"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Imiona Innych Graczy"
+
+#~ msgid "Own Name"
+#~ msgstr "Własne Imię"
+
+#~ msgid "GM Names"
+#~ msgstr "Imiona GM"
+
+#~ msgid "NPCs"
+#~ msgstr "NPC"
+
+#~ msgid "Monsters"
+#~ msgstr "Potwory"
+
+#~ msgid "Unknown Item Type"
+#~ msgstr "Nieznany Typ Przedmiotu"
+
+#~ msgid "Generics"
+#~ msgstr "Ogólne"
+
+#~ msgid "Hats"
+#~ msgstr "Kapelusze"
+
+#~ msgid "Usables"
+#~ msgstr "Użytkowe"
+
+#~ msgid "Shirts"
+#~ msgstr "Koszulki"
+
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Bronie jednoręczne"
+
+#~ msgid "Pants"
+#~ msgstr "Spodnie"
+
+#~ msgid "Shoes"
+#~ msgstr "Buty"
+
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Bronie jednoręczne"
+
+#~ msgid "Shields"
+#~ msgstr "Tarcze"
+
+#~ msgid "Rings"
+#~ msgstr "Pierścienie"
+
+#~ msgid "Necklaces"
+#~ msgstr "Naszyjniki"
+
+#~ msgid "Arms"
+#~ msgstr "Naramienniki"
+
+#~ msgid "Ammo"
+#~ msgstr "Amunicja"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Efekty Cząsteczkowe"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "Powiadomienie o podniesieniu"
+
+#~ msgid "Exp Notification"
+#~ msgstr "Powiadomienie o Exp"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Gracz uderza Potwora"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Potwór uderza Gracza"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Uderzenie Krytyczne"
+
+#~ msgid "Misses"
+#~ msgstr "Pudła"
+
+#~ msgid "HP Bar"
+#~ msgstr "Pasek HP"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 Paska HP"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 Paska HP"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 Paska HP"
+
 #~ msgid "no"
 #~ msgstr "nie"
 
diff --git a/po/pt.po b/po/pt.po
index 50635732..a7e5ff9f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: 2010-03-05 13:28+0000\n"
 "Last-Translator: Tustiman <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -18,86 +18,86 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Configuração"
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Conectando ao servidor de mapas..."
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 #, fuzzy
 msgid "Logging in"
 msgstr "Autenticar"
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Seleccione um Personagem"
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor de mapas..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 #, fuzzy
 msgid "Password Change"
 msgstr "Senha:"
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 #, fuzzy
 msgid "Email Change"
 msgstr "Modificar"
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Membro foi promovido com sucesso."
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Remover o Registo"
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de actualizações!"
 
@@ -545,25 +545,25 @@ msgstr "Preço: %s / Total: %s"
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr "Máximo"
 
@@ -581,7 +581,7 @@ msgstr "Vender"
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Cancelar"
@@ -682,7 +682,7 @@ msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr "Criar"
 
@@ -738,7 +738,7 @@ msgstr "Remover o Registo"
 msgid "Change Email"
 msgstr "Alterar e-mail"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Eliminar"
@@ -752,7 +752,7 @@ msgstr "Fechar"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr "Chat"
 
@@ -827,12 +827,12 @@ msgstr "Detalhe de partículas"
 msgid "Ambient FX: %s"
 msgstr "Efeitos Ambientais"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "Desequipar"
@@ -841,47 +841,47 @@ msgstr "Desequipar"
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventário"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 #, fuzzy
 msgid "Drop..."
 msgstr "Largar"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr "Entradas:"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Largar"
 
@@ -993,220 +993,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Desequipar"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "texto"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Sombra do Texto"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Borda do texto"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "Rótulos da barra de progresso"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Plano de fundo"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Realçar"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Realçar aba"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Item muito caro"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Item está equipado"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Jogador"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Sussurrar"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "É"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Festa"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Guilda"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Servidor"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "Histórico"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Hiperligação"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "Ser"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Nomes de outros jogadores"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Nome Próprio"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "Nomes dos GMs"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCs"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Monstros"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Tipo de item desconhecido"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Genéricos"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Chapéus"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "Usáveis"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Camisas"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "Armas para 1 mão"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Calças"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Sapatos"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "Armas para 1 mão"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Escudos"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Anéis"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Colares"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Braços"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Munição"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Efeitos de partícula"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "Aviso de achado"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "Aviso de experiência"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "Jogador acerta monstro"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Monstro acerta jogador"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Golpe crítico"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Falhas"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "Barra de HP"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 da barra de HP"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 da barra de HP"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 da barra de HP"
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
@@ -1292,11 +1078,11 @@ msgstr "Pegar"
 msgid "Add to chat"
 msgstr "@@chat|Adicionar ao chat@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr "Guardar"
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr "Recuperar"
 
@@ -1368,49 +1154,49 @@ msgstr "A password só pode ter até %d caracteres."
 msgid "Passwords do not match."
 msgstr "As senhas não coincidem."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Selecione seu servidor"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 #, fuzzy
 msgid "Server type:"
 msgstr "Servidor:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 #, fuzzy
 msgid "Connect"
 msgstr "Conectando..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 #, fuzzy
 msgid "Custom Server"
 msgstr "Cursor personalizado"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor escreva o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Aguardando servidor"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr ""
 
@@ -1447,54 +1233,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "A cor se parece com isso"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr "Cores"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 #, fuzzy
 msgid "Type:"
 msgstr "Tipo: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "Estática"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "Pulsar"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr "Arco-Íris"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 #, fuzzy
 msgid "Delay:"
 msgstr "Atraso: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 #, fuzzy
 msgid "Red:"
 msgstr "Vermelho: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 #, fuzzy
 msgid "Green:"
 msgstr "Verde: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 #, fuzzy
 msgid "Blue:"
 msgstr "Azul: "
@@ -1540,10 +1326,15 @@ msgid "Assign"
 msgstr "Associar"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Associar"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Padrão"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos nas teclas detectado."
 
@@ -1620,6 +1411,10 @@ msgstr "Grande"
 msgid "No text"
 msgstr "Sem texto"
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "texto"
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Bolhas, sem nomes"
@@ -1780,218 +1575,218 @@ msgstr "Configurações de efeito de partícula modificadas."
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito na mudança do mapa."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Competências"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr "Para cima"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Pontos de habilidade: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Competências"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Guilda criada."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Criar Guilda"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Você tem certeza que deseja sair?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > convidar um jogadora para a equipa"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > convidar um jogadora para a equipa"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Você tem certeza que deseja sair?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr "Criar Guilda"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 #, fuzzy
 msgid "Create Party"
 msgstr "Criar Personagem"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 #, fuzzy
 msgid "Invite"
 msgstr "Convidar Usuário"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 #, fuzzy
 msgid "Leave"
 msgstr "Grande"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Acaitar convite de %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitar convite de %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Acaitar convite de %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitar convite de %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Erro ao criar guilda."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 #, fuzzy
 msgid "Guild Name"
 msgstr "Guilda"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Selecione seu servidor"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s te convidou para entrar no seu grupo."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar no seu grupo."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
 msgid "Party Name"
 msgstr "Festa"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Selecione seu servidor"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
@@ -2005,25 +1800,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr "MP:"
 
@@ -2076,7 +1871,7 @@ msgstr "Pontos de habilidade: %d"
 msgid "Level"
 msgstr "Nível: %d"
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "Armazenamento"
 
@@ -2298,11 +2093,11 @@ msgstr ""
 "Este comando inicia a gravação do registo do chat para o ficheiro "
 "<nome_do_ficheiro>."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Atalho"
 
@@ -2508,20 +2303,20 @@ msgstr "Ignorar input 1"
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Corrija-os, ou o jogo irá se comportar de forma estranha."
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr "Impossível pegar item."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2851,6 +2646,10 @@ msgstr "% Fuga:"
 msgid "% Critical"
 msgstr "Golpe crítico"
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Guilda"
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Exibe esta ajuda."
@@ -2919,6 +2718,10 @@ msgstr "Resposta de convite desconhecida para %s."
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Festa"
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Convida um jogador para o seu grupo"
@@ -3757,10 +3560,154 @@ msgid "Unknown item"
 msgstr "Item desconhecido"
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr "sem nome"
 
+#~ msgid "Text Shadow"
+#~ msgstr "Sombra do Texto"
+
+#~ msgid "Text Outline"
+#~ msgstr "Borda do texto"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Rótulos da barra de progresso"
+
+#~ msgid "Background"
+#~ msgstr "Plano de fundo"
+
+#~ msgid "Highlight"
+#~ msgstr "Realçar"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Realçar aba"
+
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Item muito caro"
+
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Item está equipado"
+
+#~ msgid "GM"
+#~ msgstr "GM"
+
+#~ msgid "Player"
+#~ msgstr "Jogador"
+
+#~ msgid "Whisper"
+#~ msgstr "Sussurrar"
+
+#~ msgid "Is"
+#~ msgstr "É"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "Logger"
+#~ msgstr "Histórico"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Hiperligação"
+
+#~ msgid "Being"
+#~ msgstr "Ser"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Nomes de outros jogadores"
+
+#~ msgid "Own Name"
+#~ msgstr "Nome Próprio"
+
+#~ msgid "GM Names"
+#~ msgstr "Nomes dos GMs"
+
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
+
+#~ msgid "Monsters"
+#~ msgstr "Monstros"
+
+#~ msgid "Unknown Item Type"
+#~ msgstr "Tipo de item desconhecido"
+
+#~ msgid "Generics"
+#~ msgstr "Genéricos"
+
+#~ msgid "Hats"
+#~ msgstr "Chapéus"
+
+#~ msgid "Usables"
+#~ msgstr "Usáveis"
+
+#~ msgid "Shirts"
+#~ msgstr "Camisas"
+
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Armas para 1 mão"
+
+#~ msgid "Pants"
+#~ msgstr "Calças"
+
+#~ msgid "Shoes"
+#~ msgstr "Sapatos"
+
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Armas para 1 mão"
+
+#~ msgid "Shields"
+#~ msgstr "Escudos"
+
+#~ msgid "Rings"
+#~ msgstr "Anéis"
+
+#~ msgid "Necklaces"
+#~ msgstr "Colares"
+
+#~ msgid "Arms"
+#~ msgstr "Braços"
+
+#~ msgid "Ammo"
+#~ msgstr "Munição"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Efeitos de partícula"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "Aviso de achado"
+
+#~ msgid "Exp Notification"
+#~ msgstr "Aviso de experiência"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Jogador acerta monstro"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Monstro acerta jogador"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Golpe crítico"
+
+#~ msgid "Misses"
+#~ msgstr "Falhas"
+
+#~ msgid "HP Bar"
+#~ msgstr "Barra de HP"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 da barra de HP"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 da barra de HP"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 da barra de HP"
+
 #~ msgid "no"
 #~ msgstr "não"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a069c5e5..39d9cb5f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: 2010-02-17 04:42+0000\n"
 "Last-Translator: alms21 <alms21@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -18,86 +18,86 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Conectando ao servidor de mapas..."
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 #, fuzzy
 msgid "Logging in"
 msgstr "Login"
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Selecionar personagem"
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor de mapas..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 #, fuzzy
 msgid "Password Change"
 msgstr "Senha:"
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 #, fuzzy
 msgid "Email Change"
 msgstr "Mudar"
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Membro foi promovido com sucesso."
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Cancelar Registro"
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
@@ -545,25 +545,25 @@ msgstr "Preço: %s / Total: %s"
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr "Máximo"
 
@@ -581,7 +581,7 @@ msgstr "Vender"
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Cancelar"
@@ -682,7 +682,7 @@ msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr "Criar"
 
@@ -738,7 +738,7 @@ msgstr "Cancelar Registro"
 msgid "Change Email"
 msgstr "Alterar e-mail"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Excluir"
@@ -752,7 +752,7 @@ msgstr "Fechar"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr "Bate-papo"
 
@@ -827,12 +827,12 @@ msgstr "Detalhe de partículas"
 msgid "Ambient FX: %s"
 msgstr "Ambiente FX"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "Desequipar"
@@ -841,47 +841,47 @@ msgstr "Desequipar"
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventório"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 #, fuzzy
 msgid "Drop..."
 msgstr "Descartar"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr "Entradas:"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Descartar"
 
@@ -993,220 +993,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Desequipar"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Texto"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Sombra do Texto"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Borda do texto"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "Rótulos da barra de progresso"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Fundo"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Realçar"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Realçar aba"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Item muito caro"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Item está equipado"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Jogador"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Sussurrar"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "É"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Grupo"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Corporação"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Servidor"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "Histórico"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Link"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "Ser"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Nomes de outros jogadores"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Próprio nome"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "Nomes dos GMs"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCs"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Monstros"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Tipo de item desconhecido"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Genéricos"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Chapéus"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "Usáveis"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Camisas"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "Armas para 1 mão"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Calças"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Sapatos"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "Armas para 1 mão"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Escudos"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Anéis"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Colares"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Armas"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Munição"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Efeitos de partícula"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "Aviso de achado"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "Aviso de experiência"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "Jogador acerta monstro"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Monstro acerta jogador"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Golpe crítico"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Falhas"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "Barra de HP"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 da barra de HP"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 da barra de HP"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 da barra de HP"
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
@@ -1292,11 +1078,11 @@ msgstr "Pegar"
 msgid "Add to chat"
 msgstr "@@chat|Adicionar ao chat@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr "Guardar"
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr "Retirar"
 
@@ -1368,49 +1154,49 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Selecione seu servidor"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 #, fuzzy
 msgid "Server type:"
 msgstr "Servidor:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 #, fuzzy
 msgid "Connect"
 msgstr "Conectando..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 #, fuzzy
 msgid "Custom Server"
 msgstr "Cursor customizado"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Aguardando servidor"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr ""
 
@@ -1447,54 +1233,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "A cor se parece com isso"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr "Cores"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 #, fuzzy
 msgid "Type:"
 msgstr "Tipo: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "Estático"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "Pulso"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr "Arco-íris"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 #, fuzzy
 msgid "Delay:"
 msgstr "Atraso: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 #, fuzzy
 msgid "Red:"
 msgstr "Vermelho: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 #, fuzzy
 msgid "Green:"
 msgstr "Verde: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 #, fuzzy
 msgid "Blue:"
 msgstr "Azul: "
@@ -1540,10 +1326,15 @@ msgid "Assign"
 msgstr "Atribuir"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Atribuir"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Padrão"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos nas teclas detectado."
 
@@ -1620,6 +1411,10 @@ msgstr "Grande"
 msgid "No text"
 msgstr "Sem texto"
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "Texto"
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Bolhas, sem nomes"
@@ -1780,218 +1575,218 @@ msgstr "Configurações de efeito de partícula modificadas."
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito na mudança do mapa."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Habilidades"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr "Acima"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Pontos de habilidade: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Habilidades"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Corporação criada."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Criar corporação"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Convidar um usuário para o grupo"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Convidar um usuário para o grupo"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr "Criar corporação"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 #, fuzzy
 msgid "Create Party"
 msgstr "Criar Personagem"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 #, fuzzy
 msgid "Invite"
 msgstr "Convidar Usuário"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 #, fuzzy
 msgid "Leave"
 msgstr "Grande"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Convite de %s aceito."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Convite de %s rejeitado."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Convite de %s aceito."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Convite de %s rejeitado."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Erro ao criar corporação."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 #, fuzzy
 msgid "Guild Name"
 msgstr "Corporação"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Selecione seu servidor"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
 msgid "Party Name"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Selecione seu servidor"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
@@ -2005,25 +1800,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr "MP:"
 
@@ -2076,7 +1871,7 @@ msgstr "Pontos de habilidade: %d"
 msgid "Level"
 msgstr "Nível: %d"
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "Armazenamento"
 
@@ -2298,11 +2093,11 @@ msgstr ""
 "Este comando inicia a gravação do registro de bate-papo para o arquivo "
 "<nome_do_arquivo>."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Atalho"
 
@@ -2508,20 +2303,20 @@ msgstr "Ignorar input 1"
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Corrija-os, ou o jogo irá se comportar de forma estranha."
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr "Impossível pegar ítem."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2853,6 +2648,10 @@ msgstr "% Evasão:"
 msgid "% Critical"
 msgstr "Golpe crítico"
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Corporação"
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Exibe esta ajuda."
@@ -2921,6 +2720,10 @@ msgstr "Resposta de convite desconhecida para %s."
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Grupo"
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Convida um jogador para o seu grupo"
@@ -3762,10 +3565,154 @@ msgid "Unknown item"
 msgstr "Item desconhecido"
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr "sem nome"
 
+#~ msgid "Text Shadow"
+#~ msgstr "Sombra do Texto"
+
+#~ msgid "Text Outline"
+#~ msgstr "Borda do texto"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Rótulos da barra de progresso"
+
+#~ msgid "Background"
+#~ msgstr "Fundo"
+
+#~ msgid "Highlight"
+#~ msgstr "Realçar"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Realçar aba"
+
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Item muito caro"
+
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Item está equipado"
+
+#~ msgid "GM"
+#~ msgstr "GM"
+
+#~ msgid "Player"
+#~ msgstr "Jogador"
+
+#~ msgid "Whisper"
+#~ msgstr "Sussurrar"
+
+#~ msgid "Is"
+#~ msgstr "É"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "Logger"
+#~ msgstr "Histórico"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Link"
+
+#~ msgid "Being"
+#~ msgstr "Ser"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Nomes de outros jogadores"
+
+#~ msgid "Own Name"
+#~ msgstr "Próprio nome"
+
+#~ msgid "GM Names"
+#~ msgstr "Nomes dos GMs"
+
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
+
+#~ msgid "Monsters"
+#~ msgstr "Monstros"
+
+#~ msgid "Unknown Item Type"
+#~ msgstr "Tipo de item desconhecido"
+
+#~ msgid "Generics"
+#~ msgstr "Genéricos"
+
+#~ msgid "Hats"
+#~ msgstr "Chapéus"
+
+#~ msgid "Usables"
+#~ msgstr "Usáveis"
+
+#~ msgid "Shirts"
+#~ msgstr "Camisas"
+
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Armas para 1 mão"
+
+#~ msgid "Pants"
+#~ msgstr "Calças"
+
+#~ msgid "Shoes"
+#~ msgstr "Sapatos"
+
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Armas para 1 mão"
+
+#~ msgid "Shields"
+#~ msgstr "Escudos"
+
+#~ msgid "Rings"
+#~ msgstr "Anéis"
+
+#~ msgid "Necklaces"
+#~ msgstr "Colares"
+
+#~ msgid "Arms"
+#~ msgstr "Armas"
+
+#~ msgid "Ammo"
+#~ msgstr "Munição"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Efeitos de partícula"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "Aviso de achado"
+
+#~ msgid "Exp Notification"
+#~ msgstr "Aviso de experiência"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Jogador acerta monstro"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Monstro acerta jogador"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Golpe crítico"
+
+#~ msgid "Misses"
+#~ msgstr "Falhas"
+
+#~ msgid "HP Bar"
+#~ msgstr "Barra de HP"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 da barra de HP"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 da barra de HP"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 da barra de HP"
+
 #~ msgid "no"
 #~ msgstr "não"
 
diff --git a/po/ru.po b/po/ru.po
index 7d1ad143..4aca025a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,97 +7,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: 2010-02-17 06:54+0000\n"
 "Last-Translator: jmb_kz <jmb_kz@mail.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Подключение к серверу карт..."
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 #, fuzzy
 msgid "Logging in"
 msgstr "Вход"
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Выбор персонажа"
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Подключение к серверу карт..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 #, fuzzy
 msgid "Password Change"
 msgstr "Пароль:"
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 #, fuzzy
 msgid "Email Change"
 msgstr "Сменить"
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Удалить регистрацию"
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr ""
 
@@ -542,25 +542,25 @@ msgstr "Цена: %s / Всего: %s"
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Выход"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr "Макс"
 
@@ -578,7 +578,7 @@ msgstr "Продать"
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Отмена"
@@ -679,7 +679,7 @@ msgid "Hair style:"
 msgstr "Стрижка:"
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr "Создать"
 
@@ -735,7 +735,7 @@ msgstr "Удалить регистрацию"
 msgid "Change Email"
 msgstr "Сменить адрес E-mail"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Удалить"
@@ -749,7 +749,7 @@ msgstr "Закрыть"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr "Чат"
 
@@ -824,12 +824,12 @@ msgstr "Качество частиц"
 msgid "Ambient FX: %s"
 msgstr "Эффекты окружающей среды"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Снаряжение"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "Снять"
@@ -838,47 +838,47 @@ msgstr "Снять"
 msgid "Help"
 msgstr "Помощь"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Инвентарь"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Надеть"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Использовать"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 #, fuzzy
 msgid "Drop..."
 msgstr "Бросить"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Разделить"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr "Вместимость:"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr "Вес:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Бросить"
 
@@ -990,220 +990,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Снять"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Текст"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Затенение текста"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "Подписи Progress Bar'ов"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Фон"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Подсветка"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Подсветка закладок"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Предмет слишком дорогой для вас"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Предмет екипирован"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "ГМ"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Игрок"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Шептать"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "Есть"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Группа"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Гильдия"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Сервер"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Ссылка"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Имена других игроков"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Собственное имя"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "Имена ГМ"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "Боты"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Монстры"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Вещь неизвестного типа"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Общие"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Шляпы"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "используемый"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Рубашки"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "Одноручное оружие"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Штаны"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Обувь"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "Одноручное оружие"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Щиты"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Кольца"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Ожерелья"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Боеприпасы"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Эффекты частиц"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "Сообщение о подборе предмета"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "Сообщение об изменении опыта"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "Удары игрока по монстру"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Удары монстра по игроку"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Критический удар"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Промахи"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "Строка жизненных очков (ЖО)"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 строки ЖО"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "Половина строки ЖО"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 строки ЖО"
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
@@ -1288,11 +1074,11 @@ msgstr "Поднять"
 msgid "Add to chat"
 msgstr "@@chat|Добавить в чат@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr "Хранить"
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr "Получить"
 
@@ -1364,49 +1150,49 @@ msgstr "Пароль не должен содержать более %d симв
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 #, fuzzy
 msgid "Server type:"
 msgstr "Сервер:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 #, fuzzy
 msgid "Connect"
 msgstr "Соединение..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 #, fuzzy
 msgid "Custom Server"
 msgstr "Выборочный курсор"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 msgid "Please type both the address and the port of a server."
 msgstr "Следует указать адрес и порт сервера."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr ""
 
@@ -1443,53 +1229,53 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "Вот, как выглядит сей цвет"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 #, fuzzy
 msgid "Type:"
 msgstr "Введите: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "Статичный"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "Пульсирующий"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr "Радуга"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 #, fuzzy
 msgid "Delay:"
 msgstr "Играть"
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 #, fuzzy
 msgid "Green:"
 msgstr "Он-лайн: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 #, fuzzy
 msgid "Blue:"
 msgstr "Синий: "
@@ -1535,10 +1321,15 @@ msgid "Assign"
 msgstr "Назначить"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Назначить"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "Обнаружены конфликты клавиш!"
 
@@ -1615,6 +1406,10 @@ msgstr "Большой"
 msgid "No text"
 msgstr "Нет текста"
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "Текст"
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Пузырьки, без названий"
@@ -1772,218 +1567,218 @@ msgstr "Эффекты частиц"
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Умения"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr "Верх"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Очков навыков: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Очков навыков: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Умения"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Уровень: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Создать Гильдию"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Вы действительно хотите выйти?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "Пригласить пользователя на канал"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "Пригласить пользователя на канал"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Вы действительно хотите выйти?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr "Создать Гильдию"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 #, fuzzy
 msgid "Create Party"
 msgstr "Создать персонажа"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 #, fuzzy
 msgid "Invite"
 msgstr "Пригласить пользователя"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 #, fuzzy
 msgid "Leave"
 msgstr "Большой"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Принять приглашение от %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение от %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принять приглашение от %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение от %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 #, fuzzy
 msgid "Guild Name"
 msgstr "Гильдия"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Выберите сервер"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Получено приглашение в группу, но уже одно есть"
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s приглашает присоединиться к %s группе."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr "Получено приглашение в группу, но уже одно есть"
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s приглашает вас к себе в группу."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s приглашает вас к себе в группу."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
 msgid "Party Name"
 msgstr "Группа"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Выберите сервер"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
@@ -1997,25 +1792,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr "Деньги: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr "ЖО:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr "Мана:"
 
@@ -2068,7 +1863,7 @@ msgstr "Очков навыков: %d"
 msgid "Level"
 msgstr "Уровень: %d"
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "Хранение"
 
@@ -2287,11 +2082,11 @@ msgstr "Эта команда показывает число пользоват
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда начнет протоколирование окна чата в файл <имя файла>."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Состояние"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Клавиша"
 
@@ -2497,20 +2292,20 @@ msgstr "Игнорировать ввод 1"
 msgid "Ignore input 2"
 msgstr "Игнорировать ввод 2"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Исправьте их, или игра может себя странно вести."
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2824,6 +2619,10 @@ msgstr "% уклонения:"
 msgid "% Critical"
 msgstr "Критический удар"
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Гильдия"
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Показать сию справку"
@@ -2889,6 +2688,10 @@ msgstr ""
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Группа"
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Пригласить игрока в вашу группу"
@@ -3704,10 +3507,142 @@ msgid "Unknown item"
 msgstr "Неизвестный предмет"
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr "безымянный"
 
+#~ msgid "Text Shadow"
+#~ msgstr "Затенение текста"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Подписи Progress Bar'ов"
+
+#~ msgid "Background"
+#~ msgstr "Фон"
+
+#~ msgid "Highlight"
+#~ msgstr "Подсветка"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Подсветка закладок"
+
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Предмет слишком дорогой для вас"
+
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Предмет екипирован"
+
+#~ msgid "GM"
+#~ msgstr "ГМ"
+
+#~ msgid "Player"
+#~ msgstr "Игрок"
+
+#~ msgid "Whisper"
+#~ msgstr "Шептать"
+
+#~ msgid "Is"
+#~ msgstr "Есть"
+
+#~ msgid "Server"
+#~ msgstr "Сервер"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Ссылка"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Имена других игроков"
+
+#~ msgid "Own Name"
+#~ msgstr "Собственное имя"
+
+#~ msgid "GM Names"
+#~ msgstr "Имена ГМ"
+
+#~ msgid "NPCs"
+#~ msgstr "Боты"
+
+#~ msgid "Monsters"
+#~ msgstr "Монстры"
+
+#~ msgid "Unknown Item Type"
+#~ msgstr "Вещь неизвестного типа"
+
+#~ msgid "Generics"
+#~ msgstr "Общие"
+
+#~ msgid "Hats"
+#~ msgstr "Шляпы"
+
+#~ msgid "Usables"
+#~ msgstr "используемый"
+
+#~ msgid "Shirts"
+#~ msgstr "Рубашки"
+
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Одноручное оружие"
+
+#~ msgid "Pants"
+#~ msgstr "Штаны"
+
+#~ msgid "Shoes"
+#~ msgstr "Обувь"
+
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Одноручное оружие"
+
+#~ msgid "Shields"
+#~ msgstr "Щиты"
+
+#~ msgid "Rings"
+#~ msgstr "Кольца"
+
+#~ msgid "Necklaces"
+#~ msgstr "Ожерелья"
+
+#~ msgid "Ammo"
+#~ msgstr "Боеприпасы"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Эффекты частиц"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "Сообщение о подборе предмета"
+
+#~ msgid "Exp Notification"
+#~ msgstr "Сообщение об изменении опыта"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Удары игрока по монстру"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Удары монстра по игроку"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Критический удар"
+
+#~ msgid "Misses"
+#~ msgstr "Промахи"
+
+#~ msgid "HP Bar"
+#~ msgstr "Строка жизненных очков (ЖО)"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 строки ЖО"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "Половина строки ЖО"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 строки ЖО"
+
 #~ msgid "no"
 #~ msgstr "Нет"
 
diff --git a/po/sv.po b/po/sv.po
index 24dca564..755aa4e8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-03-16 22:27+0100\n"
 "PO-Revision-Date: 2009-07-17 05:36+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -18,86 +18,86 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Inställningar"
 
-#: src/client.cpp:623
+#: src/client.cpp:625
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Ansluter till kartservern..."
 
-#: src/client.cpp:650
+#: src/client.cpp:652
 #, fuzzy
 msgid "Logging in"
 msgstr "Användarnamn"
 
-#: src/client.cpp:683
+#: src/client.cpp:685
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:741
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Välj karaktär"
 
-#: src/client.cpp:768
+#: src/client.cpp:770
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Ansluter till kartservern..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
 #: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
 #: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
 msgid "Error"
 msgstr "Fel"
 
-#: src/client.cpp:815
+#: src/client.cpp:817
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:844
 #, fuzzy
 msgid "Password Change"
 msgstr "Lösenord:"
 
-#: src/client.cpp:843
+#: src/client.cpp:845
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:864
 #, fuzzy
 msgid "Email Change"
 msgstr "Ändra"
 
-#: src/client.cpp:863
+#: src/client.cpp:865
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Medlem befordrad."
 
-#: src/client.cpp:883
+#: src/client.cpp:885
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Avregistrera"
 
-#: src/client.cpp:884
+#: src/client.cpp:886
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1009 src/client.cpp:1032
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1121
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ogiltig uppdateringsvärd: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1155 src/client.cpp:1161
 msgid "Error creating updates directory!"
 msgstr "Kunde inte skapa katalog för uppdateringar!"
 
@@ -545,25 +545,25 @@ msgstr "Pris: %s / Totalt: %s"
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
 #: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
+#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
 msgid "Max"
 msgstr "Max"
 
@@ -581,7 +581,7 @@ msgstr "Sälj"
 #: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Avbryt"
@@ -682,7 +682,7 @@ msgid "Hair style:"
 msgstr "Frisyr:"
 
 #: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/socialwindow.cpp:297
 msgid "Create"
 msgstr "Skapa"
 
@@ -738,7 +738,7 @@ msgstr "Avregistrera"
 msgid "Change Email"
 msgstr "Ändra epostadress"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
 #: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Ta bort"
@@ -752,7 +752,7 @@ msgstr "Stäng"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77
 msgid "Chat"
 msgstr "Chatt"
 
@@ -827,12 +827,12 @@ msgstr "Partikeldetaljer"
 msgid "Ambient FX: %s"
 msgstr "Omgivande FX"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
+#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
 #: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "Avrusta"
@@ -841,47 +841,47 @@ msgstr "Avrusta"
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
 msgid "Close"
 msgstr "Stäng"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventarium"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Utrusta"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
+#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Använd"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
 #: src/gui/popupmenu.cpp:380
 #, fuzzy
 msgid "Drop..."
 msgstr "Släpp"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Dela"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
+#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
 msgid "Slots:"
 msgstr "Utrymme:"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:98
 msgid "Weight:"
 msgstr "Vikt:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Släpp"
 
@@ -995,220 +995,6 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Avrusta"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Text"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Textskugga"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Textkontur"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "Förloppsindikatoretiketter"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Bakgrund"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Markering"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Flikmarkering"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Den är för dyr"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Du har utrustat dig"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Spelare"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Viskning"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "Är"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Grupp"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Gille"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Server"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "Loggning"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Länk"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "Varelse"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Andra spelares namn"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Eget namn"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "GM-namn"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPC:er"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Monster"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Okänt föremålsslag"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Allmänna föremål"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Huvudbonader"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "Förbrukningsvaror"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Tröjor"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "Enhandsvapen"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Byxor"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Skor"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "Enhandsvapen"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Sköldar"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Ringar"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Halsband"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Handskar"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Ammunition"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Partikeleffekter"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "Upplocksnotis"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "XP-notifiering"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "Spelare slår monster"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Monster slår spelare"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Kritisk träff"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Missar"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "Full hälsostapel"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "Trekvarts hälsostapel"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "Halv hälsostapel"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "Kvarts hälsostapel"
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
@@ -1294,11 +1080,11 @@ msgstr "Plocka upp"
 msgid "Add to chat"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
 msgid "Store"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
 msgid "Retrieve"
 msgstr "Hämta"
 
@@ -1370,49 +1156,49 @@ msgstr "Lösenordet måste vara kortare än %d tecken."
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:124
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Välj din server"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:132
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:133
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:153
 #, fuzzy
 msgid "Connect"
 msgstr "Ansluter..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:154
 #, fuzzy
 msgid "Custom Server"
 msgstr "Särskild muspekare"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:242
 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."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:357
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:363
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Väntar på server"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:367
 msgid "Preparing download"
 msgstr ""
 
@@ -1449,54 +1235,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "Så här ser färgen ut"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr "Färger"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:71
 #, fuzzy
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "Statisk"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "Pulserande"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:332
 msgid "Rainbow"
 msgstr "Regnbåge"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:93
 #, fuzzy
 msgid "Delay:"
 msgstr "Fördröjning: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:108
 #, fuzzy
 msgid "Red:"
 msgstr "Röd: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:123
 #, fuzzy
 msgid "Green:"
 msgstr "Grön: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:138
 #, fuzzy
 msgid "Blue:"
 msgstr "Blå: "
@@ -1542,10 +1328,15 @@ msgid "Assign"
 msgstr "Tilldela"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Tilldela"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Förval"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "Samma tangent används på flera ställen."
 
@@ -1622,6 +1413,10 @@ msgstr "Stor"
 msgid "No text"
 msgstr "Ingen text"
 
+#: src/gui/setup_video.cpp:143
+msgid "Text"
+msgstr "Text"
+
 #: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Textbubblor utan namn"
@@ -1782,218 +1577,218 @@ msgstr "Inställningar för partikeleffekter ändrade."
 msgid "Changes will take effect on map change."
 msgstr "Förändringar kommer att börja gälla när du byter karta."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Färdigheter"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:209
 msgid "Up"
 msgstr "Upp"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:263
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Färdighetspoäng: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:315
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Färdighetspoäng: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:324
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Färdigheter"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:406
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Nivå: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:417
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:118
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:127
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Gille skapat."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:137
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:138
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Skapa gille"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:148
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Är du säker på att du vill avsluta?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:183
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Bjud in en spelare till din grupp"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:200
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Bjud in en spelare till din grupp"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:201
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:210
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:211
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Är du säker på att du vill avsluta?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:240
 msgid "Create Guild"
 msgstr "Skapa gille"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
 #, fuzzy
 msgid "Create Party"
 msgstr "Skapa karaktär"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:298
 #, fuzzy
 msgid "Invite"
 msgstr "Bjud in spelare"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:299
 #, fuzzy
 msgid "Leave"
 msgstr "Stor"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:395
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accepterade injudan från %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:401
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Avslog inbjudan från %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:414
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accepterade injudan från %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:420
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Avslog inbjudan från %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:464
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Kunde inte skapa gille."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:485
 #, fuzzy
 msgid "Guild Name"
 msgstr "Gille"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:486
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Välj din server"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:498
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:503
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s har bjudit in dig till %ss grupp."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:508
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Acceptera gruppinbjudan"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:520
 msgid "Received party request, but one already exists."
 msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:530
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s har bjudit in dig till sin grupp."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:534
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s har bjudit in dig till %ss grupp."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:542
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har bjudit in dig till sin grupp."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:547
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har bjudit in dig till %ss grupp."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:555
 msgid "Accept Party Invite"
 msgstr "Acceptera gruppinbjudan"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:566
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
 msgid "Party Name"
 msgstr "Grupp"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:572
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Välj din server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
@@ -2007,25 +1802,25 @@ msgstr ""
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
 #, c-format
 msgid "Money: %s"
 msgstr "Pengar: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:104
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:109
 msgid "Exp:"
 msgstr "EP:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:114
 msgid "MP:"
 msgstr "MP:"
 
@@ -2078,7 +1873,7 @@ msgstr "Färdighetspoäng: %d"
 msgid "Level"
 msgstr "Nivå: %d"
 
-#: src/gui/storagewindow.cpp:58
+#: src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "Lagring"
 
@@ -2301,11 +2096,11 @@ msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Det här kommandot startar loggning av chatten till <filnamn>."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Genvägar"
 
@@ -2511,20 +2306,20 @@ msgstr "Ignorera inmatning 1"
 msgid "Ignore input 2"
 msgstr "Ignorera inmatning 2"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:184
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Se till att använda olika tangenter, annars kan det bli konstigheter."
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:914
 msgid "Unable to pick up item."
 msgstr "Kunde inte plocka upp."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:923
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -2855,6 +2650,10 @@ msgstr "% Kringgå:"
 msgid "% Critical"
 msgstr "Kritisk träff"
 
+#: src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Gille"
+
 #: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Visa den här hjälpen"
@@ -2923,6 +2722,10 @@ msgstr "Okänt injudningssvar från %s."
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Grupp"
+
 #: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Bjud in en spelare till din grupp"
@@ -3764,10 +3567,154 @@ msgid "Unknown item"
 msgstr "Okänt föremål"
 
 #: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/monsterdb.cpp:69
 msgid "unnamed"
 msgstr "namnlös"
 
+#~ msgid "Text Shadow"
+#~ msgstr "Textskugga"
+
+#~ msgid "Text Outline"
+#~ msgstr "Textkontur"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Förloppsindikatoretiketter"
+
+#~ msgid "Background"
+#~ msgstr "Bakgrund"
+
+#~ msgid "Highlight"
+#~ msgstr "Markering"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Flikmarkering"
+
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Den är för dyr"
+
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Du har utrustat dig"
+
+#~ msgid "GM"
+#~ msgstr "GM"
+
+#~ msgid "Player"
+#~ msgstr "Spelare"
+
+#~ msgid "Whisper"
+#~ msgstr "Viskning"
+
+#~ msgid "Is"
+#~ msgstr "Är"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Logger"
+#~ msgstr "Loggning"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Länk"
+
+#~ msgid "Being"
+#~ msgstr "Varelse"
+
+#~ msgid "Other Players' Names"
+#~ msgstr "Andra spelares namn"
+
+#~ msgid "Own Name"
+#~ msgstr "Eget namn"
+
+#~ msgid "GM Names"
+#~ msgstr "GM-namn"
+
+#~ msgid "NPCs"
+#~ msgstr "NPC:er"
+
+#~ msgid "Monsters"
+#~ msgstr "Monster"
+
+#~ msgid "Unknown Item Type"
+#~ msgstr "Okänt föremålsslag"
+
+#~ msgid "Generics"
+#~ msgstr "Allmänna föremål"
+
+#~ msgid "Hats"
+#~ msgstr "Huvudbonader"
+
+#~ msgid "Usables"
+#~ msgstr "Förbrukningsvaror"
+
+#~ msgid "Shirts"
+#~ msgstr "Tröjor"
+
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Enhandsvapen"
+
+#~ msgid "Pants"
+#~ msgstr "Byxor"
+
+#~ msgid "Shoes"
+#~ msgstr "Skor"
+
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Enhandsvapen"
+
+#~ msgid "Shields"
+#~ msgstr "Sköldar"
+
+#~ msgid "Rings"
+#~ msgstr "Ringar"
+
+#~ msgid "Necklaces"
+#~ msgstr "Halsband"
+
+#~ msgid "Arms"
+#~ msgstr "Handskar"
+
+#~ msgid "Ammo"
+#~ msgstr "Ammunition"
+
+#~ msgid "Particle Effects"
+#~ msgstr "Partikeleffekter"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "Upplocksnotis"
+
+#~ msgid "Exp Notification"
+#~ msgstr "XP-notifiering"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Spelare slår monster"
+
+#, fuzzy
+#~ msgid "Monster Hits Player"
+#~ msgstr "Monster slår spelare"
+
+#~ msgid "Critical Hit"
+#~ msgstr "Kritisk träff"
+
+#~ msgid "Misses"
+#~ msgstr "Missar"
+
+#~ msgid "HP Bar"
+#~ msgstr "Full hälsostapel"
+
+#~ msgid "3/4 HP Bar"
+#~ msgstr "Trekvarts hälsostapel"
+
+#~ msgid "1/2 HP Bar"
+#~ msgstr "Halv hälsostapel"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "Kvarts hälsostapel"
+
 #~ msgid "no"
 #~ msgstr "nej"