Rebuild language files again. Update translations. Fixed typo in text lines.

New translation for Finish language. thanks for Byakushin.

17 files changed, 3309 insertions, 3606 deletions

diff --git a/po/da.po b/po/da.po
index 4c62c0d23..fc96c8005 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\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"
@@ -461,10 +461,10 @@ msgstr "Sælg"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -781,146 +781,143 @@ msgstr "Flyt til venstre"
 msgid "Net"
 msgstr "Næste"
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 #, fuzzy
 msgid "Music:"
 msgstr "Lydstyrke på musik"
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 #, fuzzy
 msgid "Map:"
 msgstr "Navn: %s"
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 #, fuzzy
 msgid "Minimap:"
 msgstr "MiniKort"
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+#, fuzzy
+msgid "Cursor:"
+msgstr "Brugerdefineret cursor"
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 #, fuzzy
 msgid "Player Position:"
 msgstr "Spiller rammer monster"
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, fuzzy, c-format
-msgid "Particle count: %d"
+#: src/gui/debugwindow.cpp:140
+#, fuzzy
+msgid "Particle count:"
 msgstr "Partikeleffekter"
 
-#: src/gui/debugwindow.cpp:141
-#, fuzzy, c-format
-msgid "Map actors count: %d"
-msgstr "Du har brugt alle dine points"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-#, fuzzy
-msgid "Cursor:"
-msgstr "Brugerdefineret cursor"
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
-msgstr ""
+#: src/gui/debugwindow.cpp:219
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Partikeleffekter"
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 #, fuzzy
 msgid "Target:"
 msgstr "Flyt til venstre"
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 #, fuzzy
 msgid "Target Id:"
 msgstr "Vælg spiller som ny modstander"
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 #, fuzzy
 msgid "Target Level:"
 msgstr "Vælg spiller som ny modstander"
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 #, fuzzy
 msgid "Target Party:"
 msgstr "Vælg spiller som ny modstander"
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 #, fuzzy
 msgid "Target Guild:"
 msgstr "Vælg spiller som ny modstander"
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 #, fuzzy
 msgid "Attack delay:"
 msgstr "Angreb %+d"
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 #, fuzzy
 msgid "Minimal hit:"
 msgstr "MiniKort"
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 #, fuzzy
 msgid "Critical hit:"
 msgstr "Kritisk sår"
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -937,8 +934,8 @@ msgstr "Udstyr"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Tag af"
 
@@ -985,27 +982,27 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Tag på"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Brug"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 #, fuzzy
 msgid "Drop..."
 msgstr "Smid"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Opdel"
 
@@ -1019,17 +1016,17 @@ msgid "Weight:"
 msgstr "Vægt:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Gem på lager"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Hent fra lager"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Smid"
@@ -1309,8 +1306,7 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Hellebard"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid "> Next"
 msgstr "Næste"
@@ -1457,7 +1453,7 @@ msgid "Show Items"
 msgstr "Vis navn"
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
 msgstr ""
 
@@ -1494,8 +1490,8 @@ msgstr "@@chat|Tilføj til chat@@"
 msgid "Pick up"
 msgstr "Saml op"
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Tilføj til chat@@"
@@ -1509,8 +1505,8 @@ msgstr ""
 msgid "Rename"
 msgstr "Husk Brugernavn"
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 #, fuzzy
 msgid "Remove"
 msgstr "Husk Brugernavn"
@@ -1570,96 +1566,98 @@ msgstr "Stor"
 msgid "Change guild position"
 msgstr "Ændre"
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 #, fuzzy
 msgid "Store 10"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 #, fuzzy
 msgid "Store half"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 #, fuzzy
 msgid "Store all"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Hent fra lager"
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Hent fra lager"
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Hent fra lager"
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 #, fuzzy
 msgid "(default)"
 msgstr "Standard"
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 #, fuzzy
 msgid "Move up"
 msgstr "Flyt op"
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 #, fuzzy
 msgid "Move down"
 msgstr "Flyt ned"
@@ -3701,7 +3699,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:68
 #, fuzzy
-msgid "Smiles"
+msgid "Smilies"
 msgstr "Smiley"
 
 #: src/gui/windowmenu.cpp:70
@@ -5365,7 +5363,7 @@ msgstr "Du har nu oprettet gruppen."
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, fuzzy, c-format
-msgid "%s has join your party."
+msgid "%s has joined your party."
 msgstr "%s har forladt gruppen."
 
 #: src/net/tmwa/partyhandler.cpp:177
@@ -5385,7 +5383,7 @@ msgstr "%s er nu medlem af din gruppe."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
@@ -5483,7 +5481,7 @@ msgid ""
 msgstr ""
 
 #: src/net/tmwa/playerhandler.cpp:351
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #: src/net/tmwa/playerhandler.cpp:456
@@ -5622,7 +5620,7 @@ msgstr ""
 
 #: src/net/tmwa/tradehandler.cpp:258
 #, fuzzy
-msgid "Failed adding item. You cant trade this item."
+msgid "Failed adding item. You can't trade this item."
 msgstr ""
 "Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på "
 "vinduet."
@@ -5677,6 +5675,14 @@ msgid "Unknown item"
 msgstr "Ukendt genstand"
 
 #, fuzzy
+#~ msgid "Map actors count: %d"
+#~ msgstr "Du har brugt alle dine points"
+
+#, fuzzy
+#~ msgid "Smiles"
+#~ msgstr "Smiley"
+
+#, fuzzy
 #~ msgid "@@trade|Trade@@"
 #~ msgstr "@@trade|Handl med %s@@"
 
diff --git a/po/de.po b/po/de.po
index 11f337568..cca80af87 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\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"
@@ -484,10 +484,10 @@ msgstr "Verkaufen"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -793,146 +793,143 @@ msgstr "NPC anvisieren"
 msgid "Net"
 msgstr "Weiter"
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 #, fuzzy
 msgid "Music:"
 msgstr "Lautstärke der Musik: "
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 #, fuzzy
 msgid "Map:"
 msgstr "Karte: "
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 #, fuzzy
 msgid "Minimap:"
 msgstr "Übersichtskarte: "
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+#, fuzzy
+msgid "Cursor:"
 msgstr "Cursor: (%d, %d)"
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 #, fuzzy
 msgid "Player Position:"
 msgstr "Spieler"
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, c-format
-msgid "Particle count: %d"
+#: src/gui/debugwindow.cpp:140
+#, fuzzy
+msgid "Particle count:"
 msgstr "Partikelzählung: %d"
 
-#: src/gui/debugwindow.cpp:141
-#, fuzzy, c-format
-msgid "Map actors count: %d"
-msgstr "Spielfigurattribute OK"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, fuzzy, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (OpenGL)"
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, fuzzy, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (OpenGL)"
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, fuzzy, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (OpenGL)"
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-#, fuzzy
-msgid "Cursor:"
-msgstr "Cursor: (%d, %d)"
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
-msgstr ""
+#: src/gui/debugwindow.cpp:219
+#, c-format
+msgid "Particle count: %d"
+msgstr "Partikelzählung: %d"
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 #, fuzzy
 msgid "Target:"
 msgstr "NPC anvisieren"
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 #, fuzzy
 msgid "Target Id:"
 msgstr "NPC anvisieren"
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 #, fuzzy
 msgid "Target Level:"
 msgstr "Spieler anvisieren"
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 #, fuzzy
 msgid "Target Party:"
 msgstr "Spieler anvisieren"
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 #, fuzzy
 msgid "Target Guild:"
 msgstr "Gilde erstellen"
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 #, fuzzy
 msgid "Attack delay:"
 msgstr "Angriff %+d"
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 #, fuzzy
 msgid "Minimal hit:"
 msgstr "Übersichtskarte: "
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 #, fuzzy
 msgid "Critical hit:"
 msgstr "Kritischer Treffer"
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -949,8 +946,8 @@ msgstr "Ausrüstung"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Ablegen"
 
@@ -997,26 +994,26 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Ausrüsten"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Benutzen"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 msgid "Drop..."
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Aufteilen"
 
@@ -1030,17 +1027,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Einlagern"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Wegwerfen"
@@ -1319,8 +1316,7 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Waffenarm"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid "> Next"
 msgstr ""
@@ -1466,7 +1462,7 @@ msgid "Show Items"
 msgstr "Geschlecht"
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
 msgstr ""
 
@@ -1503,8 +1499,8 @@ msgstr "Zu Chat hinzufügen"
 msgid "Pick up"
 msgstr "Aufheben"
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
@@ -1517,8 +1513,8 @@ msgstr ""
 msgid "Rename"
 msgstr "Name"
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 #, fuzzy
 msgid "Remove"
 msgstr "Benutzername merken"
@@ -1578,97 +1574,99 @@ msgstr "Stufe: %d"
 msgid "Change guild position"
 msgstr "Ändern"
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 #, fuzzy
 msgid "Add to trade"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 #, fuzzy
 msgid "Store 10"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 #, fuzzy
 msgid "Store half"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 #, fuzzy
 msgid "Store all"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Abholen"
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Abholen"
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Abholen"
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 #, fuzzy
 msgid "Show"
 msgstr "Zeigen"
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 #, fuzzy
 msgid "(default)"
 msgstr "Standard"
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 #, fuzzy
 msgid "Move up"
 msgstr "Laufe Hoch"
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 #, fuzzy
 msgid "Move down"
 msgstr "Laufe Runter"
@@ -3702,7 +3700,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:68
 #, fuzzy
-msgid "Smiles"
+msgid "Smilies"
 msgstr "Grinsen"
 
 #: src/gui/windowmenu.cpp:70
@@ -5338,7 +5336,7 @@ msgstr "Party erfolgreich erstellt."
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, fuzzy, c-format
-msgid "%s has join your party."
+msgid "%s has joined your party."
 msgstr "%s hat Deine Party verlassen."
 
 #: src/net/tmwa/partyhandler.cpp:177
@@ -5358,7 +5356,7 @@ msgstr "%s ist nun Mitglied Deiner Party."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
@@ -5461,7 +5459,7 @@ msgstr ""
 
 #: src/net/tmwa/playerhandler.cpp:351
 #, fuzzy
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
 "heilen."
@@ -5603,7 +5601,7 @@ msgstr ""
 
 #: src/net/tmwa/tradehandler.cpp:258
 #, fuzzy
-msgid "Failed adding item. You cant trade this item."
+msgid "Failed adding item. You can't trade this item."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
 "Gegenstände hinzufügen."
@@ -5657,6 +5655,17 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
+#~ msgid "Cursor: (%d, %d)"
+#~ msgstr "Cursor: (%d, %d)"
+
+#, fuzzy
+#~ msgid "Map actors count: %d"
+#~ msgstr "Spielfigurattribute OK"
+
+#, fuzzy
+#~ msgid "Smiles"
+#~ msgstr "Grinsen"
+
 #, fuzzy
 #~ msgid "@@friend|Be friend@@"
 #~ msgstr "/ignore > Ignoriere einen Spieler"
diff --git a/po/en_GB.po b/po/en_GB.po
index 28d951ded..a704e579a 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: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\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"
@@ -464,10 +464,10 @@ msgstr "Sell"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -784,146 +784,143 @@ msgstr "Move Left"
 msgid "Net"
 msgstr "Next"
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 #, fuzzy
 msgid "Music:"
 msgstr "Topic: %s"
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 #, fuzzy
 msgid "Map:"
 msgstr "Name: %s"
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 #, fuzzy
 msgid "Minimap:"
 msgstr "MiniMap"
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+#, fuzzy
+msgid "Cursor:"
+msgstr "Custom cursor"
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 #, fuzzy
 msgid "Player Position:"
 msgstr "Player hits Monster"
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, fuzzy, c-format
-msgid "Particle count: %d"
+#: src/gui/debugwindow.cpp:140
+#, fuzzy
+msgid "Particle count:"
 msgstr "Particle Effects"
 
-#: src/gui/debugwindow.cpp:141
-#, fuzzy, c-format
-msgid "Map actors count: %d"
-msgstr "Character stats OK"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-#, fuzzy
-msgid "Cursor:"
-msgstr "Custom cursor"
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
-msgstr ""
+#: src/gui/debugwindow.cpp:219
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Particle Effects"
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 #, fuzzy
 msgid "Target:"
 msgstr "Move Left"
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 #, fuzzy
 msgid "Target Id:"
 msgstr "Target Player"
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 #, fuzzy
 msgid "Target Level:"
 msgstr "Target Player"
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 #, fuzzy
 msgid "Target Party:"
 msgstr "Target Player"
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 #, fuzzy
 msgid "Target Guild:"
 msgstr "Target Player"
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 #, fuzzy
 msgid "Attack delay:"
 msgstr "Attack %+d"
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 #, fuzzy
 msgid "Minimal hit:"
 msgstr "MiniMap"
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 #, fuzzy
 msgid "Critical hit:"
 msgstr "Critical Hit"
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -940,8 +937,8 @@ msgstr "Equipment"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Unequip"
 
@@ -988,27 +985,27 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Equip"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Use"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 #, fuzzy
 msgid "Drop..."
 msgstr "Drop"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Split"
 
@@ -1022,17 +1019,17 @@ msgid "Weight:"
 msgstr "Weight:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Store"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Retrieve"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Drop"
@@ -1312,8 +1309,7 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Polearm"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid "> Next"
 msgstr "Next"
@@ -1460,7 +1456,7 @@ msgid "Show Items"
 msgstr "Show name"
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
 msgstr ""
 
@@ -1497,8 +1493,8 @@ msgstr "@@chat|Add to chat@@"
 msgid "Pick up"
 msgstr "Pick up"
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Add to chat@@"
@@ -1512,8 +1508,8 @@ msgstr ""
 msgid "Rename"
 msgstr "Remember Username"
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 #, fuzzy
 msgid "Remove"
 msgstr "Remember Username"
@@ -1573,96 +1569,98 @@ msgstr "Large"
 msgid "Change guild position"
 msgstr "Change"
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 #, fuzzy
 msgid "Store 10"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 #, fuzzy
 msgid "Store half"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 #, fuzzy
 msgid "Store all"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Retrieve"
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Retrieve"
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Retrieve"
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 #, fuzzy
 msgid "(default)"
 msgstr "Default"
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 #, fuzzy
 msgid "Move up"
 msgstr "Move Up"
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 #, fuzzy
 msgid "Move down"
 msgstr "Move Down"
@@ -3693,7 +3691,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:68
 #, fuzzy
-msgid "Smiles"
+msgid "Smilies"
 msgstr "Smiley"
 
 #: src/gui/windowmenu.cpp:70
@@ -5363,7 +5361,7 @@ msgstr "Party successfully created."
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, fuzzy, c-format
-msgid "%s has join your party."
+msgid "%s has joined your party."
 msgstr "%s has left your party."
 
 #: src/net/tmwa/partyhandler.cpp:177
@@ -5383,7 +5381,7 @@ msgstr "%s is now a member of your party."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
@@ -5484,7 +5482,7 @@ msgstr ""
 
 #: src/net/tmwa/playerhandler.cpp:351
 #, fuzzy
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "You are carrying more than half your maximum load. You are unable to "
 "automatically regain health."
@@ -5624,7 +5622,7 @@ msgstr "Failed to add item. Trade partner has no free slot."
 
 #: src/net/tmwa/tradehandler.cpp:258
 #, fuzzy
-msgid "Failed adding item. You cant trade this item."
+msgid "Failed adding item. You can't trade this item."
 msgstr ""
 "Failed adding item. You can not overlap one kind of item on the window."
 
@@ -5678,6 +5676,14 @@ msgid "Unknown item"
 msgstr "Unknown item"
 
 #, fuzzy
+#~ msgid "Map actors count: %d"
+#~ msgstr "Character stats OK"
+
+#, fuzzy
+#~ msgid "Smiles"
+#~ msgstr "Smiley"
+
+#, fuzzy
 #~ msgid "@@trade|Trade@@"
 #~ msgstr "@@trade|Trade With %s@@"
 
diff --git a/po/es.po b/po/es.po
index 684dac342..e46cd7616 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,20 +1,19 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
-"PO-Revision-Date: 2011-04-29 16:22+0000\n"
-"Last-Translator: nelson6e65 <nelson6eeduardo65@gmail.com>\n"
-"Language-Team: Spanish (Castilian) <>\n"
-"Language: es\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"PO-Revision-Date: 2011-05-22 13:59+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/manaplus/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1028
@@ -125,8 +124,8 @@ msgstr "¡No puedes enviar susurros vacíos!"
 #: src/commandhandler.cpp:407
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
@@ -261,19 +260,16 @@ msgid "font cache size"
 msgstr "tamaño de caché de fuente"
 
 #: src/commandhandler.cpp:1092
-#, fuzzy
 msgid "Cache size:"
-msgstr "tamaño de caché de fuente"
+msgstr "Tám. caché:"
 
 #: src/commandhandler.cpp:1096
-#, fuzzy
 msgid "Created:"
-msgstr "Creado: "
+msgstr "Creado:"
 
 #: src/commandhandler.cpp:1098
-#, fuzzy
 msgid "Deleted:"
-msgstr "Eliminado: "
+msgstr "Borrado:"
 
 #: src/commandhandler.cpp:1145 src/commandhandler.cpp:1152
 msgid "Resource images:"
@@ -286,8 +282,7 @@ msgstr ""
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr "Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:232 src/gui/widgets/chattab.cpp:398
 msgid "General"
@@ -439,10 +434,10 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -534,11 +529,11 @@ msgstr "<"
 
 #: src/gui/charcreatedialog.cpp:78
 msgid "Hair color:"
-msgstr "Color del cabello:"
+msgstr "Color peinado:"
 
 #: src/gui/charcreatedialog.cpp:81
 msgid "Hair style:"
-msgstr "Estilo del cabello:"
+msgstr "Estilo peinado:"
 
 #: src/gui/charcreatedialog.cpp:87
 msgid "Race:"
@@ -589,7 +584,7 @@ msgstr "Configuración de la cuenta y los personajes"
 
 #: src/gui/charselectdialog.cpp:137
 msgid "Switch Login"
-msgstr "Salir del Login"
+msgstr "Volver al Login"
 
 #: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:56
@@ -601,19 +596,16 @@ msgid "Change Email"
 msgstr "Cambiar e-mail"
 
 #: src/gui/charselectdialog.cpp:252
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Cabello incorecto."
+msgstr "Contraseña incorrecta"
 
 #: src/gui/charselectdialog.cpp:285
-#, fuzzy
 msgid "Enter password for deleting character"
-msgstr "Fallo al borrar el personaje."
+msgstr "Ingrese la contraseña para borrar el personaje"
 
 #: src/gui/charselectdialog.cpp:285
-#, fuzzy
 msgid "Enter password:"
-msgstr "Contrasena incorrecta."
+msgstr "Ingrese contraseña:"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
@@ -732,146 +724,136 @@ msgid "Map"
 msgstr "Mapa"
 
 #: src/gui/debugwindow.cpp:69
-#, fuzzy
 msgid "Target"
-msgstr "Objetivo:"
+msgstr "Objetivo"
 
 #: src/gui/debugwindow.cpp:70
-#, fuzzy
 msgid "Net"
-msgstr "Siguiente"
+msgstr "Red"
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 msgid "Music:"
 msgstr "Música:"
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 msgid "Map:"
 msgstr "Mapa:"
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 msgid "Minimap:"
 msgstr "Minimapa:"
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr "Cursor: (%d, %d)"
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+msgid "Cursor:"
+msgstr "Cursor:"
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 msgid "Player Position:"
 msgstr "Posición del jugador:"
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, c-format
-msgid "Particle count: %d"
-msgstr "Recuento de partículas: %d"
+#: src/gui/debugwindow.cpp:140
+msgid "Particle count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:141
-#, c-format
-msgid "Map actors count: %d"
-msgstr "Numero de agentes en el mapa: %d"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
+msgstr "Numero de agentes en el mapa:"
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Programa)"
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (OpenGL rapido)"
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (Antiguo OpenGL)"
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
-#, fuzzy
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
-msgstr "Numero de agentes en el mapa:"
+msgstr "Contador de Texturas:"
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-msgid "Cursor:"
-msgstr "Cursor:"
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
-msgstr "Numero de agentes en el mapa:"
+#: src/gui/debugwindow.cpp:219
+#, c-format
+msgid "Particle count: %d"
+msgstr "Recuento de partículas: %d"
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 msgid "Target:"
 msgstr "Objetivo:"
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 msgid "Target Id:"
 msgstr "Seccionar ID:"
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 msgid "Target Level:"
 msgstr "Diana de nivel:"
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 msgid "Target Party:"
 msgstr "Grupo de destino:"
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 msgid "Target Guild:"
 msgstr "Diana de Guild:"
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
-#, fuzzy
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 msgid "Attack delay:"
-msgstr "Retardo de Ataque"
+msgstr "Retraso de ataque:"
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
-#, fuzzy
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 msgid "Minimal hit:"
-msgstr "Minimapa:"
+msgstr "Golpe mínimo:"
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
-msgstr ""
+msgstr "Golpe máximo:"
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
-#, fuzzy
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 msgid "Critical hit:"
-msgstr "Golpe Critico"
+msgstr "Golpe crítico:"
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr "Ping: %d ms"
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr "Ping: ? ms"
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "In: %d bytes/s"
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Out: %d bytes/s"
@@ -884,12 +866,12 @@ msgstr "OK"
 
 #: src/gui/equipmentwindow.cpp:76 src/gui/windowmenu.cpp:71
 msgid "Equipment"
-msgstr "Equipamento"
+msgstr "Equipamiento"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Quitárselo"
 
@@ -933,26 +915,26 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 msgid "Drop..."
 msgstr "Tirar..."
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Dividir"
 
@@ -966,17 +948,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Almacenar"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Tirar"
@@ -1200,11 +1182,11 @@ msgstr "barra de trabajo"
 
 #: src/gui/ministatus.cpp:89
 msgid "weight bar"
-msgstr "barra de pero"
+msgstr "barra de peso"
 
 #: src/gui/ministatus.cpp:92
 msgid "inventory slots bar"
-msgstr "bara de ranuras del inventario"
+msgstr "barra de ranuras del inventario"
 
 #: src/gui/ministatus.cpp:95
 msgid "money bar"
@@ -1242,8 +1224,7 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Limpiar"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 msgid "> Next"
 msgstr "> Siguiente"
 
@@ -1285,26 +1266,24 @@ msgstr "Intercambio"
 
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:345
 msgid "Whisper"
-msgstr ""
+msgstr "Susurrar"
 
 #: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:585
 msgid "Heal"
-msgstr ""
+msgstr "Sanar"
 
 #: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:351
 #: src/gui/popupmenu.cpp:592
-#, fuzzy
 msgid "Be friend"
-msgstr "amigo"
+msgstr "Ser amigo"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:148
 #: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:353
 #: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:378
 #: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
 #: src/gui/popupmenu.cpp:626
-#, fuzzy
 msgid "Disregard"
-msgstr "Desconocido"
+msgstr "Desatender"
 
 #: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:152
 #: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:168
@@ -1312,18 +1291,16 @@ msgstr "Desconocido"
 #: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:373
 #: src/gui/popupmenu.cpp:597 src/gui/popupmenu.cpp:605
 #: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:619
-#, fuzzy
 msgid "Erase"
-msgstr "Borrado"
+msgstr "Borrar"
 
 #: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:166
 #: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:365
 #: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
 #: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:618
 #: src/gui/popupmenu.cpp:624
-#, fuzzy
 msgid "Unignore"
-msgstr "Ignorar"
+msgstr "Des-ignorar"
 
 #: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:177
 #: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:380
@@ -1334,100 +1311,85 @@ msgstr "Ignorar completamente"
 
 #: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:388
 #: src/gui/popupmenu.cpp:636
-#, fuzzy
 msgid "Follow"
-msgstr "Seguir: "
+msgstr "Seguir"
 
 #: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:389
 #: src/gui/popupmenu.cpp:637
-#, fuzzy
 msgid "Imitation"
-msgstr "Imitacion: "
+msgstr "Imitación"
 
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:658
-#, fuzzy
 msgid "Invite to party"
-msgstr "Invitación de un miembro al grupo"
+msgstr "Invitar a grupo"
 
 #: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:398
 #: src/gui/popupmenu.cpp:663
-#, fuzzy
 msgid "Kick from party"
-msgstr "@@kick party|Sacar del grupo@@"
+msgstr "Sacar del grupo"
 
 #: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:409
 #: src/gui/popupmenu.cpp:677
-#, fuzzy
 msgid "Kick from guild"
-msgstr "Usted fue expulsado del gremio."
+msgstr "Sacar del gremio"
 
 #: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:411
 #: src/gui/popupmenu.cpp:679
-#, fuzzy
 msgid "Change pos in guild"
-msgstr "@@guild-pos|Cambiar la posición en en gremio >@@"
+msgstr "Cambiar posición en el gremio"
 
 #: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:416
 #: src/gui/popupmenu.cpp:685
-#, fuzzy
 msgid "Invite to guild"
-msgstr "Miembro invitado al clan."
+msgstr "Invitar al gremio"
 
 #: src/gui/popupmenu.cpp:233
-#, fuzzy
 msgid "Kick player"
-msgstr "Jugador VIP."
+msgstr "Sacar jugador"
 
 #: src/gui/popupmenu.cpp:235
 msgid "Nuke"
-msgstr ""
+msgstr "Eliminar"
 
 #: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:639
-#, fuzzy
 msgid "Show Items"
-msgstr "Mostrar nivel"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
-msgstr ""
+msgstr "Desvestir"
 
 #: src/gui/popupmenu.cpp:270
 msgid "Kick"
-msgstr ""
+msgstr "Sacar"
 
 #: src/gui/popupmenu.cpp:281
-#, fuzzy
 msgid "Remove from attack list"
-msgstr "@@remove attack|Quitar de la lista de ataque@@"
+msgstr "Remover de la lista de ataque"
 
 #: src/gui/popupmenu.cpp:287
-#, fuzzy
 msgid "Add to priority attack list"
-msgstr "@@add attack priority|Agregar a lista de ataque prioritaria@@"
+msgstr "Añadir a la lista de ataque prioritaria"
 
 #: src/gui/popupmenu.cpp:289
-#, fuzzy
 msgid "Add to attack list"
-msgstr "@@add attack|Añadir a la lista de ataque@@"
+msgstr "Agregar a la lista de ataque"
 
 #: src/gui/popupmenu.cpp:292
-#, fuzzy
 msgid "Add to ignore list"
-msgstr "Agregar todo al intercambio"
+msgstr "Agregar a la lista de ignorados"
 
 #: src/gui/popupmenu.cpp:305 src/gui/popupmenu.cpp:427
-#, fuzzy
 msgid "Add name to chat"
-msgstr "Añadir al chat"
+msgstr "Agregar nombre al chat"
 
 #: src/gui/popupmenu.cpp:453
-#, fuzzy
 msgid "Pick up"
-msgstr "Coger"
+msgstr "Recoger"
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
@@ -1436,32 +1398,29 @@ msgid "Map Item"
 msgstr "Mapa Objeto"
 
 #: src/gui/popupmenu.cpp:472
-#, fuzzy
 msgid "Rename"
-msgstr "Remover nombre"
+msgstr "Renombrar"
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 msgid "Remove"
 msgstr "Quitar"
 
 #: src/gui/popupmenu.cpp:487
-#, fuzzy
 msgid "Load old outfits"
-msgstr "Cargar atajos antiguos de artículos"
+msgstr "Cargar conjuntos antiguos"
 
 #: src/gui/popupmenu.cpp:503 src/gui/windowmenu.cpp:93
 msgid "Spells"
 msgstr "Hechizos"
 
 #: src/gui/popupmenu.cpp:505
-#, fuzzy
 msgid "Load old spells"
-msgstr "@@load old spells|Cargar los hechizos antiguos@@"
+msgstr "Cargar hechizos antiguos"
 
 #: src/gui/popupmenu.cpp:506
 msgid "Edit spell"
-msgstr ""
+msgstr "Editar hechizo"
 
 #: src/gui/popupmenu.cpp:532
 msgid "Disable highlight"
@@ -1495,84 +1454,86 @@ msgstr "Dejar"
 msgid "Change guild position"
 msgstr "Cambiar posición del gremio"
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa"
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr "Nombre:"
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 msgid "Add to trade"
 msgstr "Agredar al intercambio"
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 msgid "Store 10"
 msgstr "Almacenar 10"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 msgid "Store all"
 msgstr "Almacenar todo"
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr "Cargar atajos antiguos de artículos"
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr "Cargar atajos antiguos de soltar (drop)"
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 msgid "(default)"
 msgstr "(predeterminado)"
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 msgid "Move up"
 msgstr "Subir"
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 msgid "Move down"
 msgstr "Bajar"
 
@@ -2010,7 +1971,7 @@ msgstr "Amigo"
 
 #: src/gui/setup_players.cpp:68
 msgid "Disregarded"
-msgstr "Desconocido"
+msgstr "Desatendido"
 
 #: src/gui/setup_players.cpp:69
 msgid "Ignored"
@@ -2368,7 +2329,7 @@ msgstr "Habilidades"
 
 #: src/gui/skilldialog.cpp:239
 msgid "Up"
-msgstr "Encima"
+msgstr "Incrementar"
 
 #: src/gui/skilldialog.cpp:292
 #, c-format
@@ -3122,7 +3083,8 @@ msgid "Change"
 msgstr "Cambiar"
 
 #: src/gui/tradewindow.cpp:314
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
@@ -3150,7 +3112,7 @@ msgstr "Jugar"
 
 #: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
-msgstr "##3  El proceso de actualización esta incompleto."
+msgstr "##1  El proceso de actualización esta incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
 #: src/gui/updatewindow.cpp:547
@@ -3279,19 +3241,16 @@ msgid "Portal Highlight"
 msgstr "Resaltar portal"
 
 #: src/gui/userpalette.cpp:149
-#, fuzzy
 msgid "Default collision Highlight"
-msgstr "Resaltar colisión"
+msgstr "Resaltar colisiones"
 
 #: src/gui/userpalette.cpp:151
-#, fuzzy
 msgid "Air collision Highlight"
-msgstr "Resaltar colisión"
+msgstr "Puesta en evidencia de las colisiones: Aere"
 
 #: src/gui/userpalette.cpp:153
-#, fuzzy
 msgid "Water collision Highlight"
-msgstr "Resaltar colisión"
+msgstr "Puesta en evidencia de las colisiones: Agua"
 
 #: src/gui/userpalette.cpp:155
 msgid "Walkable Highlight"
@@ -3477,7 +3436,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jugador>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr "Este comando para de ignorar al jugador si había sido ignorado."
 
 #: src/gui/windowmenu.cpp:62
@@ -3501,8 +3461,8 @@ msgid "KS"
 msgstr "KS"
 
 #: src/gui/windowmenu.cpp:68
-msgid "Smiles"
-msgstr "Sonrisas"
+msgid "Smilies"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:70
 msgid "STA"
@@ -3693,7 +3653,7 @@ msgstr "Ventana de inventario"
 
 #: src/keyboardconfig.cpp:125
 msgid "Equipment Window"
-msgstr "Ventana de equipamento"
+msgstr "Ventana de equipamiento"
 
 #: src/keyboardconfig.cpp:127
 msgid "Skill Window"
@@ -4207,7 +4167,8 @@ msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
-"Parece que tu plan de romper las armas de tus enemigos con tu garganta falló!"
+"Parece que tu plan de romper las armas de tus enemigos con tu garganta "
+"falló!"
 
 #: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:112
 msgid "I guess this did not run too well."
@@ -4260,7 +4221,7 @@ msgstr "Nombre del jugador ya existe."
 
 #: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
-msgstr "Estilo de pelo no válido."
+msgstr "Estilo de cabello no válido."
 
 #: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
@@ -4683,7 +4644,7 @@ msgstr "Error de conexión desconocido."
 
 #: src/net/tmwa/generalhandler.cpp:221
 msgid "Got disconnected from server!"
-msgstr "Desconectado del servidor!"
+msgstr "¡Desconectado del servidor!"
 
 #: src/net/tmwa/generalhandler.cpp:253
 msgid "Luck"
@@ -4702,9 +4663,8 @@ msgid "M.Defense"
 msgstr "Defensa M."
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy
 msgid "% Accuracy"
-msgstr "% Presición"
+msgstr "% Precisión"
 
 #: src/net/tmwa/generalhandler.cpp:260
 msgid "% Evade"
@@ -4903,7 +4863,8 @@ msgstr "Comando: /item"
 
 #: src/net/tmwa/gui/partytab.cpp:100
 msgid "This command displays the party's current item sharing policy."
-msgstr "Este comando muestra el actual estado de compartir objetos en el grupo"
+msgstr ""
+"Este comando muestra el actual estado de compartir objetos en el grupo"
 
 #: src/net/tmwa/gui/partytab.cpp:105
 msgid "Command: /exp <policy>"
@@ -4972,7 +4933,7 @@ msgstr "Imposible equipar."
 
 #: src/net/tmwa/loginhandler.cpp:91
 msgid "Account was not found. Please re-login."
-msgstr "Cuenta no encontrada. Por favor conéctate de nuevo."
+msgstr "Cuenta no encontrada. Por favor re-conéctate."
 
 #: src/net/tmwa/loginhandler.cpp:97
 msgid "New password too short."
@@ -4998,8 +4959,8 @@ msgstr "Rechazado del servidor."
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
-"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
-"GM."
+"Has sido baneado permanentemente del juego. Por favor contacta con el equipo"
+" GM."
 
 #: src/net/tmwa/loginhandler.cpp:178
 msgid "Client too old."
@@ -5048,8 +5009,8 @@ msgstr "Grupo creado."
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, c-format
-msgid "%s has join your party."
-msgstr "%s se ha unido a tu grupo."
+msgid "%s has joined your party."
+msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:177
 #, c-format
@@ -5068,8 +5029,8 @@ msgstr "%s ahora es un miembro de tu grupo."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
-msgstr "%s no puede unirse a yu grupo porque está lleno."
+msgid "%s can't join your party because party is full."
+msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
 #, c-format
@@ -5162,13 +5123,13 @@ msgstr "Mensaje"
 
 #: src/net/tmwa/playerhandler.cpp:341
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
 
 #: src/net/tmwa/playerhandler.cpp:351
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
-"Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
 
 #: src/net/tmwa/playerhandler.cpp:456
 #, c-format
@@ -5303,8 +5264,8 @@ msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Error al anadir objeto. El otro jugador no tiene más espacio."
 
 #: src/net/tmwa/tradehandler.cpp:258
-msgid "Failed adding item. You cant trade this item."
-msgstr "Fallo al agregar artículo. No puedes intercambiar este artículo."
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
 
 #: src/net/tmwa/tradehandler.cpp:262
 msgid "Failed adding item for unknown reason."
@@ -5355,110 +5316,4 @@ msgstr "PM %+d"
 msgid "Unknown item"
 msgstr "Objeto desconocido"
 
-#~ msgid "@@trade|Trade@@"
-#~ msgstr "@@trade|Intercambio@@"
-
-#~ msgid "@@attack|Attack@@"
-#~ msgstr "@@attack|Ataque@@"
-
-#~ msgid "@@whisper|Whisper@@"
-#~ msgstr "@@whisper|Susurrar@@"
-
-#~ msgid "@@heal|Heal@@"
-#~ msgstr "@@heal|Curar@@"
-
-#~ msgid "@@friend|Be friend@@"
-#~ msgstr "@@friend|Ser amigos@@"
-
-#~ msgid "@@disregard|Disregard@@"
-#~ msgstr "@@disregard|Desatender@@"
-
-#~ msgid "@@ignore|Ignore@@"
-#~ msgstr "@@ignore|Ignorar@@"
-
-#~ msgid "@@erase|Erase@@"
-#~ msgstr "@@erase|Eliminar@@"
-
-#~ msgid "@@unignore|Unignore@@"
-#~ msgstr "@@unignore|Dejar de Ignorar@@"
-
-#~ msgid "@@ignore|Completely ignore@@"
-#~ msgstr "@@ignore|Ignorar completamente@@"
-
-#~ msgid "@@follow|Follow@@"
-#~ msgstr "@@follow|Seguir@@"
-
-#~ msgid "@@imitation|Imitation@@"
-#~ msgstr "@@imitation|Imitación@@"
-
-#~ msgid "@@party|Invite to party@@"
-#~ msgstr "@@party|Invitar al grupo@@"
-
-#~ msgid "@@guild-kick|Kick from guild@@"
-#~ msgstr "@@guild-kick|Sacar dela gremio@@"
-
-#~ msgid "@@guild|Invite to guild@@"
-#~ msgstr "@@guild|Invitar al gremio@@"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Expulsar jugador@@"
-
-#~ msgid "@@nuke|Nuke@@"
-#~ msgstr "@@nuke|Borar@@"
-
-#~ msgid "@@move|Move@@"
-#~ msgstr "@@move|Mover@@"
-
-#~ msgid "@@undress|Undress@@"
-#~ msgstr "@@undress|Desnudar@@"
-
-#~ msgid "@@buy|Buy@@"
-#~ msgstr "@@buy|Comprar@@"
-
-#~ msgid "@@sell|Sell@@"
-#~ msgstr "@@sell|Vender@@"
-
-#~ msgid "@@talk|Talk@@"
-#~ msgstr "@@talk|Hablar@@"
-
-#~ msgid "@@admin-kick|Kick@@"
-#~ msgstr "@@admin-kick|Sacar@@"
-
-#~ msgid "@@add attack ignore|Add to ignore list@@"
-#~ msgstr "@@add attack ignore|Añadir a la lista de ignorados@@"
-
-#~ msgid "@@name|Add name to chat@@"
-#~ msgstr "@@name|Agregar nombre al chat@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Cancelar@@"
-
-#~ msgid "@@player_%u|%s >@@"
-#~ msgstr "@@player_%u|%s >@@"
-
-#~ msgid "@@pickup|Pick up@@"
-#~ msgstr "@@recojer|Recoger@@"
-
-#~ msgid "@@chat|Add to chat@@"
-#~ msgstr "@@chat|Agregar al chat@@"
-
-#~ msgid "@@rename map|Rename@@"
-#~ msgstr "@@rename map|Renombrar@@"
-
-#~ msgid "@@remove map|Remove@@"
-#~ msgstr "@@remove map|Quitar@@"
-
-#~ msgid "@@load old outfits|Load old outfits@@"
-#~ msgstr "@@load old outfits|Cargar los vestidos antiguos@@"
-
-#~ msgid "@@edit spell|Edit spell@@"
-#~ msgstr "@@edit spell|Editar hechizos@@"
-
-#~ msgid "@@chat close|Close@@"
-#~ msgstr "@@chat close|Cerrar@@"
-
-#~ msgid "@@leave party|Leave@@"
-#~ msgstr "@@leave party|Dejar@@"
 
-#~ msgid "@@guild-pos-%d|%s@@"
-#~ msgstr "@@guild-pos-%d|%s@@"
diff --git a/po/fi.po b/po/fi.po
index 9f98ffb67..480a84f3d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-15 20:28+0300\n"
-"PO-Revision-Date: 2011-04-15 17:33+0000\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"PO-Revision-Date: 2011-05-22 13:59+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,112 +17,112 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:909
+#: src/actorspritemanager.cpp:1028
 msgid "Visible on map"
-msgstr ""
+msgstr "Näkyvillä kartalla"
 
-#: src/being.cpp:489
+#: src/being.cpp:504
 msgid "dodge"
-msgstr ""
+msgstr "väistö"
 
-#: src/being.cpp:489
+#: src/being.cpp:504
 msgid "miss"
-msgstr ""
+msgstr "huti"
 
-#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:93
+#: src/client.cpp:760 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:826
+#: src/client.cpp:834
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:857
+#: src/client.cpp:865
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:890
+#: src/client.cpp:898
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:982
+#: src/client.cpp:990
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1021
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1023
+#: src/client.cpp:1031
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
+#: src/client.cpp:1066 src/client.cpp:1073 src/client.cpp:1210
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:211 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
-#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
-#: src/net/tmwa/charserverhandler.cpp:188
+#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:389
+#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1082
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1101
+#: src/client.cpp:1109
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1110
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1129
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1130
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1150
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1143
+#: src/client.cpp:1151
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
+#: src/client.cpp:1340 src/client.cpp:1370 src/client.cpp:1414
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/client.cpp:1535
+#: src/client.cpp:1543
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1577 src/client.cpp:1583
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1604
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:299
 msgid "Unknown command."
 msgstr "Tuntematon komento."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:399
 msgid "Cannot send empty whispers!"
 msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:407
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -131,141 +131,153 @@ msgstr ""
 "Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai"
 " käytit omaa nimeäsi."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:427
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Pyyntö liittyä kanavalle %s lähetetty."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Ryhmän nimi puuttuu."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:454
 msgid "Guild name is missing."
 msgstr "Killan nimi puuttuu."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:467 src/commandhandler.cpp:574
+#: src/commandhandler.cpp:615 src/commandhandler.cpp:645
 msgid "Please specify a name."
 msgstr "Anna nimi."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:508
 msgid "Return toggles chat."
 msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:508
 msgid "Message closes chat."
 msgstr "Viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:519
 msgid "Return now toggles chat."
 msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:525
 msgid "Message now closes chat."
 msgstr "Nyt viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:553
 msgid "friend"
-msgstr ""
+msgstr "ystävä"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:558
 msgid "disregarded"
-msgstr ""
+msgstr "vaimennettu"
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:563
 msgid "neutral"
-msgstr ""
+msgstr "neutraali"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:582
 #, c-format
 msgid "Player already %s!"
-msgstr ""
+msgstr "Pelaaja on jo %s!"
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:596
 #, c-format
 msgid "Player successfully %s!"
-msgstr ""
+msgstr "Pelaaja on nyt %s."
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player could not be %s!"
-msgstr ""
+msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:626
 msgid "Player wasn't ignored!"
 msgstr "Pelaajaa ei ollut jätetty huomiotta!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:633
 msgid "Player no longer ignored!"
 msgstr "Pelaaja huomioidaan taas."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:635
 msgid "Player could not be unignored!"
 msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:652
 msgid "Player already erased!"
-msgstr ""
+msgstr "Pelaaja on jo pyyhitty!"
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:663
 msgid "Player successfully erased!"
-msgstr ""
+msgstr "Pelaaja pyyhitty."
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:665
 msgid "Player could not be erased!"
-msgstr ""
+msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty."
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:958 src/commandhandler.cpp:1004
 #, c-format
 msgid "Client uptime: %s"
-msgstr ""
+msgstr "Ohjelma ollut käynnissä: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:968
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d viikon"
+msgstr[1] "%d viikkoa"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:977
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d päivän"
+msgstr[1] "%d päivää"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:985
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d tunnin"
+msgstr[1] "%d tuntia"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d minuutin"
+msgstr[1] "%d minuuttia"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:1001
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d sekunnin"
+msgstr[1] "%d sekuntia"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1080
 msgid "font cache size"
+msgstr "kirjasinvälimuistin koko"
+
+#: src/commandhandler.cpp:1092
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1008
-msgid "Created: "
+#: src/commandhandler.cpp:1096
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1009
-msgid "Deleted: "
+#: src/commandhandler.cpp:1098
+msgid "Deleted:"
+msgstr ""
+
+#: src/commandhandler.cpp:1145 src/commandhandler.cpp:1152
+msgid "Resource images:"
+msgstr ""
+
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource orphaned images:"
 msgstr ""
 
 #: src/commandhandler.h:40
@@ -275,43 +287,43 @@ msgstr ""
 "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti"
 " \"true\", \"false\", \"1\" tai \"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:232 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "Yleiset"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:236 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:444
+#: src/game.cpp:449
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/game.cpp:452
+#: src/game.cpp:457
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:491
+#: src/game.cpp:496
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
-#: src/game.cpp:505
+#: src/game.cpp:510
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1028
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1035
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1410
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1411
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -324,49 +336,54 @@ msgstr "Ryhmä: %s"
 #: src/gui/beingpopup.cpp:103
 #, c-format
 msgid "Guild: %s"
-msgstr ""
+msgstr "Kilta: %s"
 
 #: src/gui/beingpopup.cpp:115
 #, c-format
 msgid "Pvp rank: %d"
-msgstr ""
+msgstr "PvP-taso: %d"
 
-#: src/gui/botcheckerwindow.cpp:263
+#: src/gui/botcheckerwindow.cpp:264
 msgid "Bot Checker"
-msgstr ""
+msgstr "Bottitutka"
 
-#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+#: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
 msgid "Name"
 msgstr "Nimi"
 
-#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
-#: src/net/tmwa/generalhandler.cpp:255
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:581
+#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
 msgid "Attack"
 msgstr "Hyökkää"
 
-#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:253
+#: src/keyboardconfig.cpp:60
 msgid "Talk"
 msgstr "Keskustele"
 
-#: src/gui/botcheckerwindow.cpp:296
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:638
 msgid "Move"
-msgstr ""
+msgstr "Liiku"
 
-#: src/gui/botcheckerwindow.cpp:297
+#: src/gui/botcheckerwindow.cpp:298
 msgid "Result"
-msgstr ""
+msgstr "Tulos"
 
-#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+#: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:121
 msgid "Reset"
 msgstr "Nollaa"
 
 #: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:645
 msgid "Buy"
 msgstr "Osta"
 
-#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
-#: src/gui/sell.cpp:320
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300
+#: src/gui/selldialog.cpp:85 src/gui/selldialog.cpp:322
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Hinta: %s / Kaikkiaan: %s"
@@ -375,7 +392,7 @@ msgstr "Hinta: %s / Kaikkiaan: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
-#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/selldialog.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr "+"
 
@@ -383,19 +400,20 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
-#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/selldialog.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
-#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/selldialog.cpp:91 src/gui/serverdialog.cpp:282
+#: src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Sulje"
 
-#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
-#: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
-#: src/gui/statuswindow.cpp:968
+#: src/gui/buydialog.cpp:97 src/gui/selldialog.cpp:92
+#: src/gui/statuswindow.cpp:488 src/gui/statuswindow.cpp:537
+#: src/gui/statuswindow.cpp:937 src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Max"
 
@@ -404,21 +422,29 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Kauppa"
 
-#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
-#: src/gui/sell.cpp:90
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:646 src/gui/selldialog.cpp:51
+#: src/gui/selldialog.cpp:58 src/gui/selldialog.cpp:90
 msgid "Sell"
 msgstr "Myy"
 
 #: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
 #: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
+#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
+#: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
+#: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Peru"
 
@@ -450,11 +476,11 @@ msgid "The email address entries mismatch."
 msgstr "Annetut sähköpostiosoitteet eivät täsmää."
 
 #: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
-#: src/gui/charselectdialog.cpp:134
+#: src/gui/charselectdialog.cpp:138
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
-#: src/gui/changepassworddialog.cpp:62 src/gui/login.cpp:92
+#: src/gui/changepassworddialog.cpp:62 src/gui/logindialog.cpp:92
 #: src/gui/register.cpp:74 src/gui/unregisterdialog.cpp:54
 msgid "Password:"
 msgstr "Salasana:"
@@ -485,7 +511,7 @@ msgstr "Uuden salasanan kopiot eivät täsmää."
 msgid "Create Character"
 msgstr "Luo hahmo"
 
-#: src/gui/charcreatedialog.cpp:71 src/gui/login.cpp:91
+#: src/gui/charcreatedialog.cpp:71 src/gui/logindialog.cpp:91
 #: src/gui/register.cpp:73
 msgid "Name:"
 msgstr "Nimi:"
@@ -514,10 +540,10 @@ msgstr "Hiustyyli:"
 
 #: src/gui/charcreatedialog.cpp:87
 msgid "Race:"
-msgstr ""
+msgstr "Rotu: "
 
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:477
+#: src/gui/socialwindow.cpp:1017
 msgid "Create"
 msgstr "Luo"
 
@@ -529,142 +555,154 @@ msgstr "Miespuolinen"
 msgid "Female"
 msgstr "Naispuolinen"
 
-#: src/gui/charcreatedialog.cpp:111 src/gui/charcreatedialog.cpp:293
+#: src/gui/charcreatedialog.cpp:111 src/gui/charcreatedialog.cpp:298
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Jaa %d pistettä"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Hahmon pistejako OK"
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
 
-#: src/gui/charselectdialog.cpp:73
+#: src/gui/charselectdialog.cpp:75
 msgid "Confirm Character Delete"
 msgstr "Vahvista hahmon poisto"
 
-#: src/gui/charselectdialog.cpp:74
+#: src/gui/charselectdialog.cpp:76
 msgid "Are you sure you want to delete this character?"
 msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
-#: src/gui/charselectdialog.cpp:122
+#: src/gui/charselectdialog.cpp:124
 msgid "Account and Character Management"
 msgstr "Tilin ja hahmojen hallinta"
 
-#: src/gui/charselectdialog.cpp:133
+#: src/gui/charselectdialog.cpp:137
 msgid "Switch Login"
 msgstr "Vaihda sisäänkirjautumistietoja"
 
-#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Poista palvelimelta"
 
-#: src/gui/charselectdialog.cpp:156
+#: src/gui/charselectdialog.cpp:160
 msgid "Change Email"
 msgstr "Vaihda sähköpostiosoite"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
+#: src/gui/charselectdialog.cpp:252
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:285
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:285
+msgid "Enter password:"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:465
 msgid "Choose"
 msgstr "Valitse"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:468
 #, c-format
 msgid "Level %d"
-msgstr ""
+msgstr "Taso %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:479 src/gui/charselectdialog.cpp:480
 msgid "(empty)"
 msgstr "(tyhjä)"
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:109
 msgid "default"
-msgstr ""
+msgstr "oletus"
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:110
 msgid "black"
-msgstr ""
+msgstr "musta"
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:111
 msgid "red"
-msgstr ""
+msgstr "punainen"
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:112
 msgid "green"
-msgstr ""
+msgstr "vihreä"
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:113
 msgid "blue"
-msgstr ""
+msgstr "sininen"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:114
 msgid "gold"
-msgstr ""
+msgstr "kulta"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:115
 msgid "yellow"
-msgstr ""
+msgstr "keltainen"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:116
 msgid "pink"
-msgstr ""
+msgstr "vaaleanpunainen"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:117
 msgid "purple"
-msgstr ""
+msgstr "violetti"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:118
 msgid "grey"
-msgstr ""
+msgstr "harmaa"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:119
 msgid "brown"
-msgstr ""
+msgstr "ruskea"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:120
 msgid "rainbow 1"
-msgstr ""
+msgstr "sateenkaari 1"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:121
 msgid "rainbow 2"
-msgstr ""
+msgstr "sateenkaari 2"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:122
 msgid "rainbow 3"
-msgstr ""
+msgstr "sateenkaari 3"
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
-#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
+#: src/gui/logindialog.cpp:76 src/gui/setup_players.cpp:216
 #: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
-#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
-#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
+#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
+#: src/gui/chatwindow.cpp:149 src/gui/setup_chat.cpp:62
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:586
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:969
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Kuiskaat pelaajalle %s: %s"
@@ -677,131 +715,166 @@ msgstr "Kyllä"
 msgid "No"
 msgstr "Ei"
 
-#: src/gui/confirmdialog.cpp:50
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:141
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:360 src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:604
 msgid "Ignore"
-msgstr ""
+msgstr "Ohita"
 
-#: src/gui/debugwindow.cpp:64 src/gui/debugwindow.cpp:75
-#, c-format
-msgid "%d FPS (Software)"
-msgstr ""
+#: src/gui/debugwindow.cpp:68 src/gui/minimap.cpp:47 src/gui/minimap.cpp:87
+msgid "Map"
+msgstr "Kartta"
 
-#: src/gui/debugwindow.cpp:68
-#, c-format
-msgid "%d FPS (fast OpenGL)"
+#: src/gui/debugwindow.cpp:69
+msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:71
-#, c-format
-msgid "%d FPS (old OpenGL)"
+#: src/gui/debugwindow.cpp:70
+msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:78
-#, c-format
-msgid "%d FPS"
-msgstr "%d FPS"
-
-#: src/gui/debugwindow.cpp:79 src/gui/debugwindow.cpp:182
-#: src/gui/debugwindow.cpp:205
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 msgid "Music:"
-msgstr ""
+msgstr "Musiikki:"
 
-#: src/gui/debugwindow.cpp:80 src/gui/debugwindow.cpp:186
-#: src/gui/debugwindow.cpp:207
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 msgid "Map:"
-msgstr ""
+msgstr "Kartta:"
 
-#: src/gui/debugwindow.cpp:81 src/gui/debugwindow.cpp:184
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 msgid "Minimap:"
+msgstr "Minikartta:"
+
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+msgid "Cursor:"
+msgstr "Osoitin:"
+
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
+msgid "Player Position:"
+msgstr "Pelaajan sijainti:"
+
+#: src/gui/debugwindow.cpp:140
+msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:82
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
+msgstr "Toimijoita kartalla:"
+
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
-msgid "Cursor: (%d, %d)"
-msgstr "Kursori: (%d, %d)"
+msgid "%d FPS (Software)"
+msgstr "%d FPS (ei kiihdytystä)"
 
-#: src/gui/debugwindow.cpp:83 src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:154
 #, c-format
-msgid "Particle count: %d"
-msgstr "Hiukkasluku: %d"
+msgid "%d FPS (fast OpenGL)"
+msgstr "%d FPS (nopea OpenGL)"
 
-#: src/gui/debugwindow.cpp:85
+#: src/gui/debugwindow.cpp:157
 #, c-format
-msgid "Map actors count: %d"
-msgstr ""
+msgid "%d FPS (old OpenGL)"
+msgstr "%d FPS (vanha OpenGL)"
 
-#: src/gui/debugwindow.cpp:91 src/gui/debugwindow.cpp:127
-#: src/gui/debugwindow.cpp:132
-msgid "Player Position:"
+#: src/gui/debugwindow.cpp:164
+#, c-format
+msgid "%d FPS"
+msgstr "%d FPS"
+
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
+msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:92 src/gui/debugwindow.cpp:139
-#: src/gui/debugwindow.cpp:164
+#: src/gui/debugwindow.cpp:219
+#, c-format
+msgid "Particle count: %d"
+msgstr "Hiukkasluku: %d"
+
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 msgid "Target:"
-msgstr ""
+msgstr "Kohde:"
 
-#: src/gui/debugwindow.cpp:93 src/gui/debugwindow.cpp:144
-#: src/gui/debugwindow.cpp:165
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 msgid "Target Id:"
-msgstr ""
+msgstr "Kohteen tunniste:"
 
-#: src/gui/debugwindow.cpp:94 src/gui/debugwindow.cpp:148
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 msgid "Target Level:"
-msgstr ""
+msgstr "Kohteen taso:"
 
-#: src/gui/debugwindow.cpp:95 src/gui/debugwindow.cpp:156
-#: src/gui/debugwindow.cpp:167
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 msgid "Target Party:"
-msgstr ""
+msgstr "Kohteen ryhmä:"
 
-#: src/gui/debugwindow.cpp:96 src/gui/debugwindow.cpp:159
-#: src/gui/debugwindow.cpp:168
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 msgid "Target Guild:"
+msgstr "Kohteen kilta:"
+
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
+msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:203
-msgid "Cursor:"
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
+msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:197 src/gui/debugwindow.cpp:210
-msgid "Map actors count:"
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
+msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
+msgid "Critical hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
-msgstr ""
+msgstr "Ping: %d ms"
 
-#: src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
-msgstr ""
+msgstr "Ping: ? ms"
 
-#: src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
-msgstr ""
+msgstr "Sisään: %d tavua/s"
 
-#: src/gui/debugwindow.cpp:228
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
-msgstr ""
+msgstr "Ulos: %d tavua/s"
 
 #: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
-#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
-#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
+#: src/gui/tradewindow.cpp:82 src/gui/tradewindow.cpp:84
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:73 src/gui/windowmenu.cpp:71
+#: src/gui/equipmentwindow.cpp:76 src/gui/windowmenu.cpp:71
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
+#: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
@@ -810,7 +883,8 @@ msgid "Help"
 msgstr "Apua"
 
 #: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:524
+#: src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Sulje"
 
@@ -825,50 +899,50 @@ msgstr "Paikkoja:"
 
 #: src/gui/inventorywindow.cpp:112
 msgid "Filter:"
-msgstr ""
+msgstr "Suodin:"
 
 #: src/gui/inventorywindow.cpp:113
 msgid "Sort:"
-msgstr ""
+msgstr "Järj.:"
 
 #: src/gui/inventorywindow.cpp:119
 msgid "na"
-msgstr ""
+msgstr "-"
 
 #: src/gui/inventorywindow.cpp:120
 msgid "az"
-msgstr ""
+msgstr "A"
 
 #: src/gui/inventorywindow.cpp:121
 msgid "id"
-msgstr ""
+msgstr "#"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Ota käyttöön"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Käytä"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 msgid "Drop..."
 msgstr "Pudota..."
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Jaa"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:485
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
 
@@ -877,18 +951,18 @@ msgid "Weight:"
 msgstr "Paino:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Varastoi"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Ota"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
-#: src/gui/windowmenu.cpp:92
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
+#: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Pudota"
 
@@ -918,19 +992,19 @@ msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
 #: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
-msgstr ""
+msgstr "Lisää ostokauppaan."
 
 #: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
-msgstr ""
+msgstr "Lisää myyntikauppaan."
 
 #: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
-msgstr ""
+msgstr "Tuntematon."
 
 #: src/gui/itempopup.cpp:171 src/gui/itempopup.cpp:177
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #: src/gui/itempopup.cpp:187
 #, c-format
@@ -939,198 +1013,194 @@ msgstr "Paino: %s"
 
 #: src/gui/killstats.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Kill stats"
-msgstr ""
+msgstr "Tappotilastot"
 
 #: src/gui/killstats.cpp:61
 msgid "Reset stats"
-msgstr ""
+msgstr "Nollaa tiedot"
 
 #: src/gui/killstats.cpp:62
 msgid "Reset timer"
-msgstr ""
+msgstr "Nollaa ajastin"
 
 #: src/gui/killstats.cpp:66
 msgid "Level: "
-msgstr ""
+msgstr "Taso: "
 
 #: src/gui/killstats.cpp:70
 msgid "Exp: "
-msgstr ""
+msgstr "Kokemus: "
 
 #: src/gui/killstats.cpp:71
 msgid " Left: "
-msgstr ""
+msgstr " Puuttuu: "
 
 #: src/gui/killstats.cpp:74
 msgid " exp, Avg Mob for 1%: ?"
-msgstr ""
+msgstr "kp, keskim. ? tappoa / 1%"
 
 #: src/gui/killstats.cpp:75 src/gui/killstats.cpp:128
 msgid "Kills: ?, Total Exp: ?"
-msgstr ""
+msgstr "Tappoja: ?, yhteensä ? kp"
 
 #: src/gui/killstats.cpp:76 src/gui/killstats.cpp:129
 msgid "Avg Exp: ?, No. of Avg mob to next level: ?"
-msgstr ""
+msgstr "Keskim. ? kp/tappo, ? tappoa seur. tasoon"
 
 #: src/gui/killstats.cpp:77 src/gui/killstats.cpp:146
 msgid "Kills/Min: ?, Exp/Min: ?"
-msgstr ""
+msgstr "? tappoa/min, ? kp/min"
 
 #: src/gui/killstats.cpp:79
 msgid "Exp speed per 1 min: ?"
-msgstr ""
+msgstr "Viime 1 min: ? kp/min"
 
 #: src/gui/killstats.cpp:80
 msgid "Time for next level per 1 min: ?"
-msgstr ""
+msgstr "Seur. tasoon siten: ? min"
 
 #: src/gui/killstats.cpp:81
 msgid "Exp speed per 5 min: ?"
-msgstr ""
+msgstr "Viime 5 min: ? kp/min"
 
 #: src/gui/killstats.cpp:82
 msgid "Time for next level per 5 min: ?"
-msgstr ""
+msgstr "Seur. tasoon siten: ? min"
 
 #: src/gui/killstats.cpp:83
 msgid "Exp speed per 15 min: ?"
-msgstr ""
+msgstr "Viime 15 min: ? kp/min"
 
 #: src/gui/killstats.cpp:84
 msgid "Time for Next level per 15 min: ?"
-msgstr ""
+msgstr "Seur. tasoon siten: ? min"
 
 #: src/gui/killstats.cpp:86
 msgid "Last kill exp: ?"
-msgstr ""
+msgstr "Viime tappo: ? kp"
 
 #: src/gui/killstats.cpp:87
 msgid "Time before jacko spawn: ?"
-msgstr ""
+msgstr "Jack'O: ilmestymiseen ? min"
 
 #: src/gui/killstats.cpp:270
 #, c-format
 msgid "Exp Speed per 1 min: %d"
-msgstr ""
+msgstr "Viime 1 min: %d kp/min"
 
 #: src/gui/killstats.cpp:275 src/gui/killstats.cpp:291
 #: src/gui/killstats.cpp:307
 #, c-format
 msgid "  Time For Next Level: %f"
-msgstr ""
+msgstr "  Seur. tasoon siten: %f min"
 
 #: src/gui/killstats.cpp:281 src/gui/killstats.cpp:297
 #: src/gui/killstats.cpp:313
 msgid "  Time For Next Level: ?"
-msgstr ""
+msgstr "  Seur. tasoon siten: ? min"
 
 #: src/gui/killstats.cpp:286
 #, c-format
 msgid "Exp Speed per 5 min: %d"
-msgstr ""
+msgstr "Viime 5 min: %d kp/min"
 
 #: src/gui/killstats.cpp:302
 #, c-format
 msgid "Exp Speed per 15 min: %d"
-msgstr ""
+msgstr "Viime 15 min: %d kp/min"
 
 #: src/gui/killstats.cpp:331
 msgid "Time before jacko spawn: jacko alive"
-msgstr ""
+msgstr "Jack'O: täällä ollaan"
 
 #: src/gui/killstats.cpp:335 src/gui/killstats.cpp:345
 msgid "Time before jacko spawn: "
-msgstr ""
+msgstr "Jack'O: "
 
 #: src/gui/killstats.cpp:336
 msgid "?"
-msgstr ""
+msgstr "?"
 
 #: src/gui/killstats.cpp:341
 msgid "Time before jacko spawn: jacko spawning"
-msgstr ""
+msgstr "Jack'O: tulossa ollaan"
 
-#: src/gui/login.cpp:57
+#: src/gui/logindialog.cpp:57
 msgid "Normal"
-msgstr ""
+msgstr "Oletus"
 
-#: src/gui/login.cpp:58
+#: src/gui/logindialog.cpp:58
 msgid "Auto Close"
-msgstr ""
+msgstr "Sulje kun valmis"
 
-#: src/gui/login.cpp:59
+#: src/gui/logindialog.cpp:59
 msgid "Skip"
-msgstr ""
+msgstr "Ohita"
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:120
+#: src/gui/logindialog.cpp:84 src/gui/logindialog.cpp:120
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: src/gui/login.cpp:88 src/gui/serverdialog.cpp:227
+#: src/gui/logindialog.cpp:88 src/gui/serverdialog.cpp:241
 #: src/gui/widgets/chattab.cpp:171
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: src/gui/login.cpp:93
+#: src/gui/logindialog.cpp:93
 msgid "Custom update host"
-msgstr ""
+msgstr "Käytä omaa päivityspalvelinta"
 
-#: src/gui/login.cpp:107
+#: src/gui/logindialog.cpp:107
 msgid "Remember username"
 msgstr "Muista käyttäjätunnus"
 
-#: src/gui/login.cpp:108
+#: src/gui/logindialog.cpp:108
 msgid "Update:"
-msgstr ""
+msgstr "Päivitys:"
 
-#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/logindialog.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#: src/gui/login.cpp:119
+#: src/gui/logindialog.cpp:119
 msgid "Change Server"
 msgstr "Vaihda palvelinta"
 
-#: src/gui/minimap.cpp:47 src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Kartta"
-
 #: src/gui/ministatus.cpp:56
 msgid "health bar"
-msgstr ""
+msgstr "terveyspalkki"
 
 #: src/gui/ministatus.cpp:62
 msgid "mana bar"
-msgstr ""
+msgstr "manapalkki"
 
 #: src/gui/ministatus.cpp:74
 msgid "experience bar"
-msgstr ""
+msgstr "kokemuspalkki"
 
 #: src/gui/ministatus.cpp:80
 msgid "job bar"
-msgstr ""
+msgstr "työpalkki"
 
 #: src/gui/ministatus.cpp:89
 msgid "weight bar"
-msgstr ""
+msgstr "painopalkki"
 
 #: src/gui/ministatus.cpp:92
 msgid "inventory slots bar"
-msgstr ""
+msgstr "tavarapaikkapalkki"
 
 #: src/gui/ministatus.cpp:95
 msgid "money bar"
-msgstr ""
+msgstr "rahapalkki"
 
 #: src/gui/ministatus.cpp:98
 msgid "arrows bar"
-msgstr ""
+msgstr "nuolipalkki"
 
 #: src/gui/ministatus.cpp:101
 msgid "status bar"
-msgstr ""
+msgstr "tilapalkki"
 
 #: src/gui/ministatus.cpp:287 src/gui/ministatus.cpp:327
 msgid "Need"
@@ -1152,14 +1222,13 @@ msgstr "Lähetä"
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:526
 msgid "Clear"
-msgstr ""
+msgstr "Tyhjennä"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 msgid "> Next"
-msgstr ""
+msgstr "> Seuraava"
 
 #: src/gui/npcpostdialog.cpp:46
 msgid "To:"
@@ -1181,7 +1250,7 @@ msgstr "Asu: %d"
 #: src/gui/outfitwindow.cpp:81 src/gui/outfitwindow.cpp:852
 #, c-format
 msgid "Key: %s"
-msgstr ""
+msgstr "Näppäin: %s"
 
 #: src/gui/outfitwindow.cpp:84
 msgid "Unequip first"
@@ -1189,304 +1258,290 @@ msgstr "Riisu ensin"
 
 #: src/gui/outfitwindow.cpp:87
 msgid "Away outfit"
-msgstr ""
+msgstr "Poissaoloasu"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
-msgid "@@trade|Trade@@"
-msgstr ""
-
-#. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
-msgid "@@attack|Attack@@"
-msgstr ""
-
-#. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
-msgid "@@whisper|Whisper@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
+#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/widgets/tradetab.cpp:42
+msgid "Trade"
+msgstr "Tee kaupat"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
-msgid "@@heal|Heal@@"
+#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:345
+msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
-msgid "@@friend|Be friend@@"
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:585
+msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
-msgid "@@disregard|Disregard@@"
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:592
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
-msgid "@@ignore|Ignore@@"
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:148
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:626
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
-msgid "@@erase|Erase@@"
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:152
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:355 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:597 src/gui/popupmenu.cpp:605
+#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:619
+msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
-msgid "@@unignore|Unignore@@"
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:365
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:624
+msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
-msgid "@@ignore|Completely ignore@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:612 src/gui/popupmenu.cpp:628
+#: src/playerrelations.cpp:404
+msgid "Completely ignore"
+msgstr "Jätä täysin huomiotta"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
-msgid "@@follow|Follow@@"
+#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:636
+msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
-msgid "@@imitation|Imitation@@"
+#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:637
+msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
-msgid "@@party|Invite to party@@"
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:658
+msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
-msgid "@@kick party|Kick from party@@"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:663
+msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
-msgid "@@guild-kick|Kick from guild@@"
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:677
+msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
-msgid "@@guild-pos|Change pos in guild >@@"
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:679
+msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
-msgid "@@guild|Invite to guild@@"
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:685
+msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:217
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:233
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:219
-msgid "@@nuke|Nuke@@"
+#: src/gui/popupmenu.cpp:235
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
-msgid "@@move|Move@@"
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:639
+msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
-msgid "@@undress|Undress@@"
+#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:1830
+msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
-msgid "@@buy|Buy@@"
+#: src/gui/popupmenu.cpp:270
+msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
-msgid "@@sell|Sell@@"
+#: src/gui/popupmenu.cpp:281
+msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:235
-msgid "@@talk|Talk@@"
+#: src/gui/popupmenu.cpp:287
+msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:249
-msgid "@@admin-kick|Kick@@"
+#: src/gui/popupmenu.cpp:289
+msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
-msgid "@@name|Add name to chat@@"
+#: src/gui/popupmenu.cpp:292
+msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Peruuta@@"
-
-#: src/gui/popupmenu.cpp:279
-#, c-format
-msgid "@@player_%u|%s >@@"
+#: src/gui/popupmenu.cpp:305 src/gui/popupmenu.cpp:427
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:403
-msgid "@@pickup|Pick up@@"
+#: src/gui/popupmenu.cpp:453
+msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:404
-msgid "@@chat|Add to chat@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
+msgid "Add to chat"
+msgstr "Lisää keskusteluun"
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:471
 msgid "Map Item"
-msgstr ""
+msgstr "Karttaolio"
 
-#: src/gui/popupmenu.cpp:423
-msgid "@@rename map|Rename@@"
+#: src/gui/popupmenu.cpp:472
+msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:424
-msgid "@@remove map|Remove@@"
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
+msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:437
-msgid "@@load old outfits|Load old outfits@@"
+#: src/gui/popupmenu.cpp:487
+msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:503 src/gui/windowmenu.cpp:93
 msgid "Spells"
-msgstr ""
+msgstr "Loitsut"
 
-#: src/gui/popupmenu.cpp:454
-msgid "@@load old spells|Load old spells@@"
+#: src/gui/popupmenu.cpp:505
+msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:455
-msgid "@@edit spell|Edit spell@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:473
-msgid "@@chat close|Close@@"
+#: src/gui/popupmenu.cpp:506
+msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:532
 msgid "Disable highlight"
-msgstr ""
+msgstr "Estä korostus"
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:537
 msgid "Enable highlight"
-msgstr ""
+msgstr "Salli korostus"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:542
 msgid "Dont remove name"
-msgstr ""
+msgstr "Älä poista nimeä"
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:547
 msgid "Remove name"
-msgstr ""
+msgstr "Poista nimi"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:552
 msgid "Enable away"
-msgstr ""
+msgstr "Ota poissaolo käyttöön"
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:557
 msgid "Disable away"
-msgstr ""
+msgstr "Poista poissaolo käytöstä"
 
-#: src/gui/popupmenu.cpp:512
-msgid "@@leave party|Leave@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:563 src/gui/socialwindow.cpp:1019
+msgid "Leave"
+msgstr "Eroa"
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:698
 msgid "Change guild position"
-msgstr ""
+msgstr "Muuta asemaa killassa"
 
-#: src/gui/popupmenu.cpp:646
-#, c-format
-msgid "@@guild-pos-%d|%s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:1044
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
-msgstr ""
+msgstr "Muuta merkin nimeä       "
 
-#: src/gui/popupmenu.cpp:1045
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
-msgstr ""
+msgstr "Nimi:                    "
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1494
 msgid "Add to trade"
-msgstr ""
+msgstr "Lisää kauppaan"
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1500
 msgid "Add to trade 10"
-msgstr ""
+msgstr "Lisää 10 kauppaan"
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1503
 msgid "Add to trade half"
-msgstr ""
+msgstr "Lisää puolet kauppaan"
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1505
 msgid "Add to trade all"
-msgstr ""
+msgstr "Lisää kaikki kauppaan"
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1517
 msgid "Store 10"
-msgstr ""
+msgstr "Varastoi 10"
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1520
 msgid "Store half"
-msgstr ""
+msgstr "Varastoi puolet"
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1522
 msgid "Store all"
-msgstr ""
+msgstr "Varastoi kaikki"
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1556
 msgid "Retrieve 10"
-msgstr ""
+msgstr "Ota 10"
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1559
 msgid "Retrieve half"
-msgstr ""
+msgstr "Ota puolet"
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1561
 msgid "Retrieve all"
-msgstr ""
+msgstr "Ota kaikki"
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
-msgid "Add to chat"
-msgstr "Lisää keskusteluun"
-
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
-msgstr ""
+msgstr "Lataa vanhat tavarapikavalinnat"
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
-msgstr ""
+msgstr "Lataa vanhat pudotuspikavalinnat"
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
-msgstr ""
+msgstr "Piilota"
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
+msgstr "Näytä"
+
+#: src/gui/popupmenu.cpp:1746
+msgid "Reset yellow bar"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
+#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
+msgid "(default)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
+msgid "Move up"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
+msgid "Move down"
 msgstr ""
 
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
-msgstr ""
+msgstr "Tallenna tila"
 
 #: src/gui/quitdialog.cpp:55
 msgid "Switch server"
@@ -1528,83 +1583,83 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: src/gui/serverdialog.cpp:212
+#: src/gui/serverdialog.cpp:226
 msgid "Choose Your Server"
 msgstr "Valitse palvelimesi"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:242
 msgid "Port:"
 msgstr "Portti:"
 
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:245
 msgid "Use same ip for game sub servers"
-msgstr ""
+msgstr "Käytä samaa IP-osoitetta alipalvelimille"
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
 msgid "Server type:"
 msgstr "Palvelintyyppi:"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:283
 msgid "Load"
-msgstr ""
+msgstr "Lataa"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:284
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: src/gui/serverdialog.cpp:263
+#: src/gui/serverdialog.cpp:285
 msgid "Custom Server"
 msgstr "Muu palvelin"
 
-#: src/gui/serverdialog.cpp:370
+#: src/gui/serverdialog.cpp:390
 msgid "Please type both the address and the port of a server."
 msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
 
-#: src/gui/serverdialog.cpp:513
+#: src/gui/serverdialog.cpp:548
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lataan palvelinluettelon...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:553
 msgid "Waiting for server..."
 msgstr "Odotan palvelinta..."
 
-#: src/gui/serverdialog.cpp:522
+#: src/gui/serverdialog.cpp:557
 msgid "Preparing download"
 msgstr "Valmistelen latausta"
 
-#: src/gui/serverdialog.cpp:526
+#: src/gui/serverdialog.cpp:561
 msgid "Error retreiving server list!"
 msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
-#: src/gui/serverdialog.cpp:624
+#: src/gui/serverdialog.cpp:659
 msgid "requires a newer version"
 msgstr "vaatii uudemman version"
 
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:661
 #, c-format
 msgid "requires v%s"
 msgstr "vaatii version %s"
 
 #: src/gui/setup_audio.cpp:48
 msgid "Enable Audio"
-msgstr ""
+msgstr "Ota äänet käyttöön"
 
 #: src/gui/setup_audio.cpp:49
 msgid "Enable game sfx"
-msgstr ""
+msgstr "Ota pelin äänitehosteet käyttöön"
 
 #: src/gui/setup_audio.cpp:50
 msgid "Enable gui sfx"
-msgstr ""
+msgstr "Ota käyttöliittymän äänitehosteet käyttöön"
 
 #: src/gui/setup_audio.cpp:51
 msgid "Enable music"
-msgstr ""
+msgstr "Ota musiikki käyttöön"
 
 #: src/gui/setup_audio.cpp:52
 msgid "Enable mumble voice chat"
-msgstr ""
+msgstr "Ota muminaäänikeskustelu käyttöön"
 
 #: src/gui/setup_audio.cpp:54
 msgid "Download music"
@@ -1638,64 +1693,64 @@ msgstr "Äänimoottori"
 
 #: src/gui/setup_chat.cpp:66
 msgid "Remove colors from received chat messages"
-msgstr ""
+msgstr "Poista värit saapuneista keskusteluviesteistä"
 
 #: src/gui/setup_chat.cpp:70
 msgid "Log magic messages in debug tab"
-msgstr ""
+msgstr "Kirjaa magiaviestit debug-välilehdelle"
 
 #: src/gui/setup_chat.cpp:77
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr ""
+msgstr "Salli magia ja GM-komennot kaikilla keskusteluvälilehdillä"
 
 #: src/gui/setup_chat.cpp:82
 msgid "Show server messages in debug tab"
-msgstr ""
+msgstr "Näytä palvelinviestit debug-välilehdellä"
 
 #: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
-msgstr ""
+msgstr "Kirjaa keskustelut"
 
 #: src/gui/setup_chat.cpp:90
 msgid "Enable trade tab"
-msgstr ""
+msgstr "Ota kaupankäyntivälilehti käyttöön"
 
 #: src/gui/setup_chat.cpp:94
 msgid "Hide shop messages"
-msgstr ""
+msgstr "Piilota kauppaviestit"
 
 #: src/gui/setup_chat.cpp:98
 msgid "Show chat history"
-msgstr ""
+msgstr "Näytä keskusteluhistoria"
 
 #: src/gui/setup_chat.cpp:102
 msgid "Enable battle tab"
-msgstr ""
+msgstr "Ota taisteluvälilehti käyttöön"
 
 #: src/gui/setup_chat.cpp:106
 msgid "Show battle events"
-msgstr ""
+msgstr "Näytä taistelutapahtumat"
 
 #: src/gui/setup_chat.cpp:110
 msgid "Show chat colors list"
-msgstr ""
+msgstr "Näytä keskustelun värilista"
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
-msgstr ""
+msgstr "Muokkaa"
 
 #: src/gui/setup_chat.cpp:116
 msgid "Limit max chars in chat line"
-msgstr ""
+msgstr "Keskusteluviestin pituusraja"
 
 #: src/gui/setup_chat.cpp:125
 msgid "Limit max lines in chat"
-msgstr ""
+msgstr "Keskusteluvälilehden riviraja"
 
 #: src/gui/setup_chat.cpp:132
 msgid "Resize chat tabs if need"
-msgstr ""
+msgstr "Muuta välilehden kokoa tarpeen mukaan"
 
 #: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -1709,26 +1764,26 @@ msgstr "Värit"
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:404
 msgid "Static"
 msgstr "Staattinen"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:401
+#: src/gui/setup_colors.cpp:405
 msgid "Pulse"
 msgstr "Sykkivä"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Rainbow"
 msgstr "Sateenkaari"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:402
+#: src/gui/setup_colors.cpp:406
 msgid "Spectrum"
 msgstr "Spektri"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:316
 msgid "Delay:"
 msgstr "Viive:"
 
@@ -1744,9 +1799,9 @@ msgstr "Vihreä:"
 msgid "Blue:"
 msgstr "Sininen:"
 
-#: src/gui/setup_colors.cpp:307
+#: src/gui/setup_colors.cpp:311
 msgid "Alpha:"
-msgstr ""
+msgstr "Alfa:"
 
 #: src/gui/setup.cpp:64
 msgid "Apply"
@@ -1800,104 +1855,108 @@ msgstr "Oletus"
 msgid "Key Conflict(s) Detected."
 msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
-msgstr ""
+msgstr "Sekal."
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
-msgstr ""
+msgstr "Näytä hirviön saama vahinko"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
-msgstr ""
+msgstr "Valikoi kohteiksi vain saavutettavia hirviöitä"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 msgid "Highlight map portals"
-msgstr ""
+msgstr "Korosta karttasiirtymät"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
-msgstr ""
+msgstr "Korosta pelaajan hyökkäyskantama"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
-msgstr ""
+msgstr "Korosta hirviön hyökkäyskantama"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
-msgstr ""
+msgstr "Vaihda pelaajakohteita syklissä"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 msgid "Cycle monster targets"
-msgstr ""
+msgstr "Vaihda hirviökohteita syklissä"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 msgid "Enable bot checker"
-msgstr ""
+msgstr "Ota bottitutka käyttöön"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 msgid "Highlight floor items"
-msgstr ""
+msgstr "Korosta maassa olevat tavarat"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
-msgstr ""
+msgstr "Villiliike (a) -ohjelma"
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 msgid "Enable shop mode"
-msgstr ""
+msgstr "Ota kauppatila käyttöön"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
-msgstr ""
+msgstr "Ota käyttöön suoja bugisten palvelinten varalta"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 msgid "Enable debug log"
-msgstr ""
+msgstr "Ota käyttöön debug-loki"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Enable server side attack"
-msgstr ""
+msgstr "Ota käyttöön palvelinpuolen hyökkäys"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
-msgstr ""
+msgstr "Korjaa sijainti automaattisesti"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
-msgstr ""
+msgstr "Hyökkää liikkuessa"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 msgid "Enable quick stats"
-msgstr ""
+msgstr "Ota pikatilastot käyttöön"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 msgid "Show warps particles"
-msgstr ""
+msgstr "Näytä siirtymissä hiukkastehoste"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
-msgstr ""
+msgstr "Salli osta/myy-pyynnöt"
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
-msgstr ""
+msgstr "Näytä hirviön vp-palkki"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 msgid "Show own hp bar"
-msgstr ""
+msgstr "Näytä oma vp-palkki"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
-msgstr ""
+msgstr "Näytä työkokemusviestit"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
-msgstr ""
+msgstr "Näytä pelaajaponnahdusikkunat"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
+msgstr "Näytä parannellut minikartat"
+
+#: src/gui/setup_other.cpp:192
+msgid "Enable attack filter"
 msgstr ""
 
 #: src/gui/setup_players.cpp:61
@@ -1922,7 +1981,7 @@ msgstr "Huomiotta jätetty"
 
 #: src/gui/setup_players.cpp:70
 msgid "Erased"
-msgstr ""
+msgstr "Pyyhitty"
 
 #: src/gui/setup_players.cpp:239
 msgid "Allow trading"
@@ -1934,7 +1993,7 @@ msgstr "Salli kuiskaukset"
 
 #: src/gui/setup_players.cpp:244
 msgid "Old"
-msgstr ""
+msgstr "Vanha"
 
 #: src/gui/setup_players.cpp:246
 msgid "Put all whispers in tabs"
@@ -1954,7 +2013,7 @@ msgstr "Kun jätät huomiotta:"
 
 #: src/gui/setup_players.cpp:302
 msgid "Show level"
-msgstr ""
+msgstr "Näytä taso"
 
 #: src/gui/setup_players.cpp:306
 msgid "Show own name"
@@ -1962,76 +2021,76 @@ msgstr "Näytä oma nimi"
 
 #: src/gui/setup_players.cpp:310
 msgid "Target dead players"
-msgstr ""
+msgstr "Ota kuolleetkin pelaajat kohteiksi"
 
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
-msgstr ""
+msgstr "Teema"
 
 #: src/gui/setup_theme.cpp:109
 msgid "Gui theme"
-msgstr ""
+msgstr "Käyttöliittymän teema"
 
 #: src/gui/setup_theme.cpp:110
 msgid "Main Font"
-msgstr ""
+msgstr "Pääkirjasin"
 
 #: src/gui/setup_theme.cpp:111
 msgid "Bold font"
-msgstr ""
+msgstr "Lihavoitu kirjasin"
 
 #: src/gui/setup_theme.cpp:112
 msgid "Particle font"
-msgstr ""
+msgstr "Hiukkaskirjasin"
 
 #: src/gui/setup_theme.cpp:113
 msgid "Help font"
-msgstr ""
+msgstr "Ohjekirjasin"
 
 #: src/gui/setup_theme.cpp:223
 msgid "Theme Changed"
-msgstr ""
+msgstr "Ulkoasua muutettu"
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:720
+#: src/gui/setup_video.cpp:725
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
 #: src/gui/setup_video.cpp:144
 msgid "Tiny (10)"
-msgstr ""
+msgstr "Pikkiriikkinen (10)"
 
 #: src/gui/setup_video.cpp:145
 msgid "Small (11)"
-msgstr ""
+msgstr "Pieni (11)"
 
 #: src/gui/setup_video.cpp:146
 msgid "Medium (12)"
-msgstr ""
+msgstr "Keskikokoinen (12)"
 
 #: src/gui/setup_video.cpp:147
 msgid "Large (13)"
-msgstr ""
+msgstr "Kookas (13)"
 
 #: src/gui/setup_video.cpp:148
 msgid "Big (14)"
-msgstr ""
+msgstr "Suuri (14)"
 
 #: src/gui/setup_video.cpp:149
 msgid "Huge (15)"
-msgstr ""
+msgstr "Jättimäinen (15)"
 
 #: src/gui/setup_video.cpp:172
 msgid "Software"
-msgstr ""
+msgstr "Ei kiihdytystä"
 
 #: src/gui/setup_video.cpp:173
 msgid "Fast OpenGL"
-msgstr ""
+msgstr "Nopea OpenGL"
 
 #: src/gui/setup_video.cpp:174
 msgid "Safe OpenGL"
-msgstr ""
+msgstr "Turvallinen OpenGL"
 
 #: src/gui/setup_video.cpp:201
 msgid "No text"
@@ -2075,7 +2134,7 @@ msgstr "Kokoruututila"
 
 #: src/gui/setup_video.cpp:278
 msgid "Hw acceleration"
-msgstr ""
+msgstr "Rautakiihdytys"
 
 #: src/gui/setup_video.cpp:279
 msgid "Custom cursor"
@@ -2109,44 +2168,44 @@ msgstr "leijuvana"
 
 #: src/gui/setup_video.cpp:292
 msgid "Hide shield sprite"
-msgstr ""
+msgstr "Piilota kilpihahmo"
 
 #: src/gui/setup_video.cpp:294
 msgid "Low traffic mode"
-msgstr ""
+msgstr "Matalan liikenteen tila"
 
 #: src/gui/setup_video.cpp:296
 msgid "Sync player move"
-msgstr ""
+msgstr "Synkronoi pelaajan liikkeet"
 
 #: src/gui/setup_video.cpp:298
 msgid "Draw hotkeys on map"
-msgstr ""
+msgstr "Piirrä siirtymäpikanäppäimet kartalle"
 
 #: src/gui/setup_video.cpp:300
 msgid "Draw path"
-msgstr ""
+msgstr "Piirrä polku"
 
 #: src/gui/setup_video.cpp:301
 msgid "Show job"
-msgstr ""
+msgstr "Näytä työ"
 
 #: src/gui/setup_video.cpp:302
 msgid "Enable opacity cache"
-msgstr ""
+msgstr "Ota käyttöön läpinäkyvyysvälimuisti"
 
 #: src/gui/setup_video.cpp:303
 msgid "Show background"
-msgstr ""
+msgstr "Näytä tausta"
 
 #: src/gui/setup_video.cpp:308
 msgid "FPS limit:"
-msgstr "Piirtonopeusrajoitin (kuvaa / sekunti):"
+msgstr "Piirtonopeusrajoitin (FPS):"
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:651 src/gui/setup_video.cpp:815
 msgid "Alt FPS limit: "
-msgstr ""
+msgstr "Vaihtoehtoinen FPS-rajoitin:"
 
 #: src/gui/setup_video.cpp:322
 msgid "Video"
@@ -2172,87 +2231,88 @@ msgstr "Hiukkastehosteiden yksityiskohtaisuus"
 msgid "Font size"
 msgstr "Kirjasimen koko"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: src/gui/setup_video.cpp:350 src/gui/setup_video.cpp:353
+#: src/gui/setup_video.cpp:650 src/gui/setup_video.cpp:802
+#: src/gui/setup_video.cpp:813
 msgid "None"
 msgstr "-"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:533
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:539
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Kokoruututilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:550
 msgid "Switching to Full Screen"
 msgstr "Vaihdan kokoruututilaan"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:563
 msgid "Changing to OpenGL"
 msgstr "Vaihdetaan käyttämään OpenGL:ää"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
 
-#: src/gui/setup_video.cpp:698
+#: src/gui/setup_video.cpp:703
 msgid "Custom resolution (example: 1024x768)"
-msgstr ""
+msgstr "Oma tarkkuus (esim. 1024x768)"
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:704
 msgid "Enter new resolution:                "
-msgstr ""
+msgstr "Anna uusi tarkkuus:                  "
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:719 src/gui/setup_video.cpp:724
 msgid "Screen Resolution Changed"
 msgstr "Ikkunan koko vaihdettu"
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
 
-#: src/gui/setup_video.cpp:751
+#: src/gui/setup_video.cpp:756
 msgid "Particle Effect Settings Changed."
 msgstr "Hiukkastehosteiden asetuksia on muutettu."
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:757
 msgid "Changes will take effect on map change."
 msgstr "Muutokset astuvat voimaan kartan vaihtuessa."
 
 #: src/gui/shopwindow.cpp:72
 msgid "Personal Shop"
-msgstr ""
+msgstr "Oma kauppa"
 
 #: src/gui/shopwindow.cpp:114
 msgid "Buy items"
-msgstr ""
+msgstr "Osta tavaroita"
 
 #: src/gui/shopwindow.cpp:115
 msgid "Sell items"
-msgstr ""
+msgstr "Myy tavaroita"
 
-#: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120 src/gui/trade.cpp:86
+#: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
+#: src/gui/tradewindow.cpp:86
 msgid "Add"
 msgstr "Lisää"
 
 #: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
 msgid "Announce"
-msgstr ""
+msgstr "Ilmoita"
 
 #: src/gui/shopwindow.cpp:123
 msgid "Show links in announce"
-msgstr ""
+msgstr "Näytä linkit ilmoituksessa"
 
 #: src/gui/shopwindow.cpp:712 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:122
@@ -2262,7 +2322,7 @@ msgstr "Kaupantekoehdotus"
 #: src/gui/shopwindow.cpp:713
 #, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr ""
+msgstr "%s haluaa %s %s - hyväksytkö?"
 
 #: src/gui/skilldialog.cpp:228 src/gui/windowmenu.cpp:78
 msgid "Skills"
@@ -2361,363 +2421,375 @@ msgstr "Eroa ryhmästä?"
 msgid "Are you sure you want to leave party %s?"
 msgstr "Haluatko varmasti erota ryhmästä %s?"
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
+msgstr "Nav"
+
+#: src/gui/socialwindow.cpp:783
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:824
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:856
+msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:891
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:954
 msgid "Create Guild"
 msgstr "Luo kilta"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:955 src/gui/socialwindow.cpp:1371
 msgid "Create Party"
 msgstr "Luo ryhmä"
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:997 src/gui/windowmenu.cpp:90
 msgid "Social"
 msgstr "Suhteet"
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:1018
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/gui/socialwindow.cpp:849
-msgid "Leave"
-msgstr "Eroa"
-
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1160
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1170
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1187
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1197
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1241
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Luon killan %s."
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1264
 #, c-format
 msgid "Creating party called %s."
 msgstr "Luon ryhmän %s."
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1278
 msgid "Guild Name"
 msgstr "Killan nimi"
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1279
 msgid "Choose your guild's name."
 msgstr "Valitse killallesi nimi."
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1293
 msgid "Received guild request, but one already exists."
 msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
-#: src/gui/socialwindow.cpp:1115
+#: src/gui/socialwindow.cpp:1299
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s on kutsunut sinut liittymään kiltaan %s."
 
-#: src/gui/socialwindow.cpp:1121
+#: src/gui/socialwindow.cpp:1305
 msgid "Accept Guild Invite"
 msgstr "Ota kiltakutsu vastaan"
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1320
 msgid "Received party request, but one already exists."
 msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1331
 msgid "You have been invited you to join a party."
 msgstr "Sinut on kutsuttu liittymään ryhmään."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1335
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sinut on kutsuttu liittymään ryhmään %s."
 
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1343
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
 
-#: src/gui/socialwindow.cpp:1164
+#: src/gui/socialwindow.cpp:1348
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
 
-#: src/gui/socialwindow.cpp:1173
+#: src/gui/socialwindow.cpp:1357
 msgid "Accept Party Invite"
 msgstr "Ota ryhmäkutsu vastaan"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1372
 msgid "Cannot create party. You are already in a party"
 msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
 
-#: src/gui/socialwindow.cpp:1193
+#: src/gui/socialwindow.cpp:1377
 msgid "Party Name"
 msgstr "Ryhmän nimi"
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1378
 msgid "Choose your party's name."
 msgstr "Anna ryhmällesi nimi."
 
-#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:85
 msgid "Specials"
 msgstr "Erikoisuudet"
 
 #: src/gui/statuspopup.cpp:194
 msgid "(D) default moves"
-msgstr ""
+msgstr "(D) oletusliikkeet"
 
 #: src/gui/statuspopup.cpp:199
 msgid "(I) invert moves"
-msgstr ""
+msgstr "(I) käännetyt liikkeet"
 
 #: src/gui/statuspopup.cpp:204
 msgid "(c) moves with some crazy moves"
-msgstr ""
+msgstr "(c) liikkuu osin villiliikkein"
 
 #: src/gui/statuspopup.cpp:209
 msgid "(C) moves with crazy moves"
-msgstr ""
+msgstr "(C) liikkuu villiliikkein"
 
 #: src/gui/statuspopup.cpp:214
 msgid "(d) double normal + crazy"
-msgstr ""
+msgstr "(d) tuplaa tavallinen + villi"
 
 #: src/gui/statuspopup.cpp:219
 msgid "(?) move"
-msgstr ""
+msgstr "(?) liiku"
 
 #: src/gui/statuspopup.cpp:237
 msgid "(a) custom crazy move"
-msgstr ""
+msgstr "(a) oma villiliike"
 
 #: src/gui/statuspopup.cpp:241
 msgid "(?) crazy move"
-msgstr ""
+msgstr "(?) villiliike"
 
 #: src/gui/statuspopup.cpp:251
 msgid "(0) default moves to target"
-msgstr ""
+msgstr "(0) oletussiirtymä kohteen luo"
 
 #: src/gui/statuspopup.cpp:256
 msgid "(1) moves to target in distance 1"
-msgstr ""
+msgstr "(1) siirry kohteen luo etäisyydellä 1"
 
 #: src/gui/statuspopup.cpp:261
 msgid "(2) moves to target in distance 2"
-msgstr ""
+msgstr "(2) siirry kohteen luo etäisyydellä 2"
 
 #: src/gui/statuspopup.cpp:266
 msgid "(3) moves to target in distance 3"
-msgstr ""
+msgstr "(3) siirry kohteen luo etäisyydellä 3"
 
 #: src/gui/statuspopup.cpp:271
 msgid "(5) moves to target in distance 5"
-msgstr ""
+msgstr "(5) siirry kohteen luo etäisyydellä 5"
 
 #: src/gui/statuspopup.cpp:276
 msgid "(7) moves to target in distance 7"
-msgstr ""
+msgstr "(7) siirry kohteen luo etäisyydellä 7"
 
 #: src/gui/statuspopup.cpp:281
 msgid "(A) moves to target in attack range"
-msgstr ""
+msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
 
 #: src/gui/statuspopup.cpp:286
 msgid "(?) move to target"
-msgstr ""
+msgstr "(?) siirry kohteen luo"
 
 #: src/gui/statuspopup.cpp:294
 msgid "(D) default follow"
-msgstr ""
+msgstr "(D) oletusseuraaminen"
 
 #: src/gui/statuspopup.cpp:298
 msgid "(R) relative follow"
-msgstr ""
+msgstr "(R) suhteellinen seuraaminen"
 
 #: src/gui/statuspopup.cpp:302
 msgid "(M) mirror follow"
-msgstr ""
+msgstr "(M) peilikuvaseuraaminen"
 
 #: src/gui/statuspopup.cpp:306
 msgid "(P) pet follow"
-msgstr ""
+msgstr "(P) lemmikkiseuraaminen"
 
 #: src/gui/statuspopup.cpp:310
 msgid "(?) unknown follow"
-msgstr ""
+msgstr "(?) tuntematon seuraaminen"
 
 #: src/gui/statuspopup.cpp:319 src/gui/statuspopup.cpp:342
 msgid "(D) default attack"
-msgstr ""
+msgstr "(D) oletushyökkäys"
 
 #: src/gui/statuspopup.cpp:324
 msgid "(s) switch attack without shield"
-msgstr ""
+msgstr "(s) vaihda hyökkäystä, ei kilpeä"
 
 #: src/gui/statuspopup.cpp:329
 msgid "(S) switch attack with shield"
-msgstr ""
+msgstr "(S) vaihda hyökkäystä, kilpi mukana"
 
 #: src/gui/statuspopup.cpp:333 src/gui/statuspopup.cpp:358
 msgid "(?) attack"
-msgstr ""
+msgstr "(?) hyökkäys"
 
 #: src/gui/statuspopup.cpp:346
 msgid "(G) go and attack"
-msgstr ""
+msgstr "(G) mene ja hyökkää"
 
 #: src/gui/statuspopup.cpp:350
 msgid "(A) go, attack, pickup"
-msgstr ""
+msgstr "(A) mene, hyökkää, nosta"
 
 #: src/gui/statuspopup.cpp:354
 msgid "(d) without auto attack"
-msgstr ""
+msgstr "(d) ei automaattista hyökkäystä"
 
 #: src/gui/statuspopup.cpp:372
 msgid "(S) small pick up 1x1 cells"
-msgstr ""
+msgstr "(S) pieni nosto 1x1 ruutua"
 
 #: src/gui/statuspopup.cpp:376
 msgid "(D) default pick up 2x1 cells"
-msgstr ""
+msgstr "(D) oletusnosto 2x1 ruutua"
 
 #: src/gui/statuspopup.cpp:380
 msgid "(F) forward pick up 2x3 cells"
-msgstr ""
+msgstr "(F) nosto edestä 2x3 ruutua"
 
 #: src/gui/statuspopup.cpp:384
 msgid "(3) pick up 3x3 cells"
-msgstr ""
+msgstr "(3) nosto 3x3 ruutua"
 
 #: src/gui/statuspopup.cpp:388
 msgid "(g) go and pick up in distance 4"
-msgstr ""
+msgstr "(g) mene ja nosta etäisyydellä 4"
 
 #: src/gui/statuspopup.cpp:392
 msgid "(G) go and pick up in distance 8"
-msgstr ""
+msgstr "(G) mene ja nosta etäisyydellä 8"
 
 #: src/gui/statuspopup.cpp:396
 msgid "(A) go and pick up in max distance"
-msgstr ""
+msgstr "(A) mene ja nosta maksimietäisyydellä"
 
 #: src/gui/statuspopup.cpp:400
 msgid "(?) pick up"
-msgstr ""
+msgstr "(?) nosta"
 
 #: src/gui/statuspopup.cpp:409
 msgid "(N) normal map view"
-msgstr ""
+msgstr "(N) normaali karttanäkymä"
 
 #: src/gui/statuspopup.cpp:413
 msgid "(D) debug map view"
-msgstr ""
+msgstr "(D) debug-karttanäkymä"
 
 #: src/gui/statuspopup.cpp:417
 msgid "(u) ultra map view"
-msgstr ""
+msgstr "(u) ultra-karttanäkymä"
 
 #: src/gui/statuspopup.cpp:421
 msgid "(U) ultra map view 2"
-msgstr ""
+msgstr "(U) ultra-karttanäkymä 2"
 
 #: src/gui/statuspopup.cpp:425
 msgid "(e) empty map view"
-msgstr ""
+msgstr "(e) tyhjä karttanäkymä"
 
 #: src/gui/statuspopup.cpp:429
 msgid "(b) black & white map view"
-msgstr ""
+msgstr "(b) mustavalkoinen karttanäkymä"
 
 #: src/gui/statuspopup.cpp:433
 msgid "(?) map view"
-msgstr ""
+msgstr "(?) karttanäkymä"
 
 #: src/gui/statuspopup.cpp:441
 msgid "(f) use #flar for magic attack"
-msgstr ""
+msgstr "(f) #flar taikahyökkäyksenä"
 
 #: src/gui/statuspopup.cpp:446
 msgid "(c) use #chiza for magic attack"
-msgstr ""
+msgstr "(c) #chiza taikahyökkäyksenä"
 
 #: src/gui/statuspopup.cpp:451
 msgid "(I) use #ingrav for magic attack"
-msgstr ""
+msgstr "(I) #ingrav taikahyökkäyksenä"
 
 #: src/gui/statuspopup.cpp:456
 msgid "(F) use #frillyar for magic attack"
-msgstr ""
+msgstr "(F) #frillyar taikahyökkäyksenä"
 
 #: src/gui/statuspopup.cpp:461
 msgid "(U) use #upmarmu for magic attack"
-msgstr ""
+msgstr "(U) #upmarmu taikahyökkäyksenä"
 
 #: src/gui/statuspopup.cpp:465
 msgid "(?) magic attack"
-msgstr ""
+msgstr "(?) taikahyökkäys"
 
 #: src/gui/statuspopup.cpp:474
 msgid "(D) default imitation"
-msgstr ""
+msgstr "(D) oletusmatkinta"
 
 #: src/gui/statuspopup.cpp:478
 msgid "(O) outfits imitation"
-msgstr ""
+msgstr "(O) asun matkinta"
 
 #: src/gui/statuspopup.cpp:482
 msgid "(?) imitation"
-msgstr ""
+msgstr "(?) matkinta"
 
 #: src/gui/statuspopup.cpp:491
 msgid "(O) on keyboard"
-msgstr ""
+msgstr "(O) paikalla"
 
 #: src/gui/statuspopup.cpp:494
 msgid "(A) away"
-msgstr ""
+msgstr "(A) poissa"
 
 #: src/gui/statuspopup.cpp:497 src/gui/statuspopup.cpp:517
 msgid "(?) away"
-msgstr ""
+msgstr "(?) poissaolo"
 
 #: src/gui/statuspopup.cpp:505
 msgid "(G) game camera mode"
-msgstr ""
+msgstr "(G) pelin kameratila"
 
 #: src/gui/statuspopup.cpp:509
 msgid "(F) free camera mode"
-msgstr ""
+msgstr "(F) vapaa kamera"
 
 #: src/gui/statuspopup.cpp:513
 msgid "(D) design camera mode"
-msgstr ""
+msgstr "(D) suunnittelukamera"
 
 #: src/gui/statuspopup.cpp:524
 msgid "Game modifiers are disabled"
-msgstr ""
+msgstr "Pelimuokkaimet poissa käytöstä"
 
 #: src/gui/statuspopup.cpp:529
 msgid "Game modifiers are enabled"
-msgstr ""
+msgstr "Pelimuokkaimet käytössä"
 
 #: src/gui/statuswindow.cpp:131 src/gui/statuswindow.cpp:257
 #: src/gui/statuswindow.cpp:320
@@ -2760,7 +2832,7 @@ msgstr "Hahmopisteitä: %d"
 #: src/gui/statuswindow.cpp:252
 #, c-format
 msgid "Level: %d (GM %d)"
-msgstr ""
+msgstr "Taso: %d (GM %d)"
 
 #: src/gui/statuswindow.cpp:308
 #, c-format
@@ -2772,23 +2844,23 @@ msgstr "Korjauspisteitä: %d"
 #: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:807
 #: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:849
 msgid "(D)"
-msgstr ""
+msgstr "(D)"
 
 #: src/gui/statuswindow.cpp:634 src/gui/statuswindow.cpp:757
 msgid "(I)"
-msgstr ""
+msgstr "(I)"
 
 #: src/gui/statuswindow.cpp:637 src/gui/statuswindow.cpp:754
 msgid "(c)"
-msgstr ""
+msgstr "(c)"
 
 #: src/gui/statuswindow.cpp:640
 msgid "(C)"
-msgstr ""
+msgstr "(C)"
 
 #: src/gui/statuswindow.cpp:643 src/gui/statuswindow.cpp:741
 msgid "(d)"
-msgstr ""
+msgstr "(d)"
 
 #: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:660
 #: src/gui/statuswindow.cpp:689 src/gui/statuswindow.cpp:708
@@ -2797,232 +2869,226 @@ msgstr ""
 #: src/gui/statuswindow.cpp:822 src/gui/statuswindow.cpp:836
 #: src/gui/statuswindow.cpp:852 src/gui/statuswindow.cpp:865
 msgid "(?)"
-msgstr ""
+msgstr "(?)"
 
 #: src/gui/statuswindow.cpp:657
 msgid "(a)"
-msgstr ""
+msgstr "(a)"
 
 #: src/gui/statuswindow.cpp:668
 msgid "(0)"
-msgstr ""
+msgstr "(0)"
 
 #: src/gui/statuswindow.cpp:671
 msgid "(1)"
-msgstr ""
+msgstr "(1)"
 
 #: src/gui/statuswindow.cpp:674
 msgid "(2)"
-msgstr ""
+msgstr "(2)"
 
 #: src/gui/statuswindow.cpp:677 src/gui/statuswindow.cpp:784
 msgid "(3)"
-msgstr ""
+msgstr "(3)"
 
 #: src/gui/statuswindow.cpp:680
 msgid "(5)"
-msgstr ""
+msgstr "(5)"
 
 #: src/gui/statuswindow.cpp:683
 msgid "(7)"
-msgstr ""
+msgstr "(7)"
 
 #: src/gui/statuswindow.cpp:686 src/gui/statuswindow.cpp:738
 #: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:862
 msgid "(A)"
-msgstr ""
+msgstr "(A)"
 
 #: src/gui/statuswindow.cpp:699
 msgid "(R)"
-msgstr ""
+msgstr "(R)"
 
 #: src/gui/statuswindow.cpp:702
 msgid "(M)"
-msgstr ""
+msgstr "(M)"
 
 #: src/gui/statuswindow.cpp:705
 msgid "(P)"
-msgstr ""
+msgstr "(P)"
 
 #: src/gui/statuswindow.cpp:719
 msgid "(s)"
-msgstr ""
+msgstr "(s)"
 
 #: src/gui/statuswindow.cpp:722 src/gui/statuswindow.cpp:775
 msgid "(S)"
-msgstr ""
+msgstr "(S)"
 
 #: src/gui/statuswindow.cpp:735 src/gui/statuswindow.cpp:790
 #: src/gui/statuswindow.cpp:843
 msgid "(G)"
-msgstr ""
+msgstr "(G)"
 
 #: src/gui/statuswindow.cpp:751
 msgid "(f)"
-msgstr ""
+msgstr "(f)"
 
 #: src/gui/statuswindow.cpp:760 src/gui/statuswindow.cpp:781
 #: src/gui/statuswindow.cpp:846
 msgid "(F)"
-msgstr ""
+msgstr "(F)"
 
 #: src/gui/statuswindow.cpp:763 src/gui/statuswindow.cpp:813
 msgid "(U)"
-msgstr ""
+msgstr "(U)"
 
 #: src/gui/statuswindow.cpp:787
 msgid "(g)"
-msgstr ""
+msgstr "(g)"
 
 #: src/gui/statuswindow.cpp:804
 msgid "(N)"
-msgstr ""
+msgstr "(N)"
 
 #: src/gui/statuswindow.cpp:810
 msgid "(u)"
-msgstr ""
+msgstr "(u)"
 
 #: src/gui/statuswindow.cpp:816
 msgid "(e)"
-msgstr ""
+msgstr "(e)"
 
 #: src/gui/statuswindow.cpp:819
 msgid "(b)"
-msgstr ""
+msgstr "(b)"
 
 #: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:859
 msgid "(O)"
-msgstr ""
+msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:109
+#: src/gui/textcommandeditor.cpp:110
 msgid "No Target"
-msgstr ""
+msgstr "Ei kohdetta"
 
-#: src/gui/textcommandeditor.cpp:110
+#: src/gui/textcommandeditor.cpp:111
 msgid "Allow Target"
-msgstr ""
+msgstr "Salli kohde"
 
-#: src/gui/textcommandeditor.cpp:111
+#: src/gui/textcommandeditor.cpp:112
 msgid "Need Target"
-msgstr ""
+msgstr "Tarvitsee kohteen"
 
-#: src/gui/textcommandeditor.cpp:116
+#: src/gui/textcommandeditor.cpp:117
 msgid "General Magic"
-msgstr ""
+msgstr "Yleismagia"
 
-#: src/gui/textcommandeditor.cpp:117
+#: src/gui/textcommandeditor.cpp:118
 msgid "Life Magic"
-msgstr ""
+msgstr "Elämämagia"
 
-#: src/gui/textcommandeditor.cpp:118
+#: src/gui/textcommandeditor.cpp:119
 msgid "War Magic"
-msgstr ""
+msgstr "Sotamagia"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "Transmute Magic"
-msgstr ""
+msgstr "Muovausmagia"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Nature Magic"
-msgstr ""
+msgstr "Luontomagia"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "Astral Magic"
-msgstr ""
+msgstr "Astraalimagia"
 
-#: src/gui/textcommandeditor.cpp:164
+#: src/gui/textcommandeditor.cpp:165
 msgid "Command Editor"
-msgstr ""
+msgstr "Komentomuokkain"
 
-#: src/gui/textcommandeditor.cpp:181
+#: src/gui/textcommandeditor.cpp:182
 msgid "magic"
-msgstr ""
+msgstr "magia"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:186
 msgid "other"
-msgstr ""
+msgstr "muu"
 
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:191
 msgid "Symbol:"
-msgstr ""
+msgstr "Symboli:"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Command:"
-msgstr ""
+msgstr "Komento:"
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Mana:"
-msgstr ""
+msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:203
 msgid "Target Type:"
-msgstr ""
+msgstr "Kohdetyyppi:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Icon:"
-msgstr ""
+msgstr "Kuvake:"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Magic level:"
-msgstr ""
+msgstr "Magiataso:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic School:"
-msgstr ""
+msgstr "Magian koulukunta:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:227
 msgid "School level:"
-msgstr ""
+msgstr "Koulukunnan taso:"
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:232
 msgid "Save"
-msgstr ""
+msgstr "Tallenna"
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:55
 msgid "Propose trade"
 msgstr "Ehdota vaihtokauppaa"
 
-#: src/gui/trade.cpp:56
+#: src/gui/tradewindow.cpp:56
 msgid "Confirmed. Waiting..."
 msgstr "Varmistettu. Odotetaan..."
 
-#: src/gui/trade.cpp:57
+#: src/gui/tradewindow.cpp:57
 msgid "Agree trade"
 msgstr "Hyväksy kauppa"
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:58
 msgid "Agreed. Waiting..."
 msgstr "Hyväksytty. Odotetaan..."
 
-#: src/gui/trade.cpp:61
+#: src/gui/tradewindow.cpp:61
 msgid "Trade: You"
 msgstr "Kauppa: Sinä"
 
-#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
-msgid "Trade"
-msgstr "Tee kaupat"
-
-#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
+#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
 #, c-format
 msgid "You get %s"
 msgstr "Saat %s"
 
-#: src/gui/trade.cpp:109
+#: src/gui/tradewindow.cpp:109
 msgid "You give:"
 msgstr "Annat:"
 
-#: src/gui/trade.cpp:113
+#: src/gui/tradewindow.cpp:113
 msgid "Change"
 msgstr "Muuta"
 
-#: src/gui/trade.cpp:314
+#: src/gui/tradewindow.cpp:314
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Esineen lisääminen epäonnistui. Et voi limittää jotakin esinetyyppiä "
-"ikkunassa."
+msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
-#: src/gui/trade.cpp:359
+#: src/gui/tradewindow.cpp:359
 msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
@@ -3061,173 +3127,181 @@ msgstr "##1  yrität myöhemmin uudelleen"
 msgid "Completed"
 msgstr "Valmis"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Being"
 msgstr "Olo"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 msgid "Friend Names"
-msgstr ""
+msgstr "Ystävien nimet"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Disregarded Names"
-msgstr ""
+msgstr "Vaimennettujen nimet"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Ignored Names"
-msgstr ""
+msgstr "Huomiotta jätettyjen nimet"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "Erased Names"
-msgstr ""
+msgstr "Pyyhittyjen nimet"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "Other Players' Names"
 msgstr "Muiden pelaajien nimet"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Own Name"
 msgstr "Oma nimi"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "GM Names"
 msgstr "GM-nimet"
 
-#: src/gui/userpalette.cpp:120
+#: src/gui/userpalette.cpp:122
 msgid "NPCs"
 msgstr "NPCt"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monsters"
 msgstr "Hirviöt"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 msgid "Monster HP bar"
-msgstr ""
+msgstr "Hirviön VP-palkki"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Monster HP bar (second color)"
-msgstr ""
+msgstr "Hirviön VP-palkki (toinen väri)"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Party Members"
 msgstr "Ryhmän jäsenet"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Guild Members"
 msgstr "Killan jäsenet"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 msgid "Particle Effects"
 msgstr "Hiukkastehosteet"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:130
 msgid "Pickup Notification"
 msgstr "Ottoilmoitus"
 
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:131
 msgid "Exp Notification"
 msgstr "Kokemusilmoitus"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:132
 msgid "Player HP bar"
-msgstr ""
+msgstr "Pelaajan VP-palkki"
 
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:134
 msgid "Player HP bar (second color)"
-msgstr ""
+msgstr "Pelaajan VP-palkki (toinen väri)"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:135
 msgid "Player Hits Monster"
-msgstr ""
+msgstr "Pelaaja lyö hirviötä"
 
-#: src/gui/userpalette.cpp:134
+#: src/gui/userpalette.cpp:136
 msgid "Monster Hits Player"
 msgstr "Hirviö lyö pelaajaa"
 
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:138
 msgid "Other Player Hits Local Player"
-msgstr ""
+msgstr "Toinen pelaaja lyö paikallista pelaajaa"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:139
 msgid "Critical Hit"
 msgstr "Täysosuma"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:141
 msgid "Local Player Hits Monster"
 msgstr "Paikallinen pelaaja lyö hirviötä"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:143
 msgid "Local Player Critical Hit"
 msgstr "Paikallinen pelaaja saa täysosuman"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:145
 msgid "Local Player Miss"
 msgstr "Paikallisen pelaajan huti"
 
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:146
 msgid "Misses"
 msgstr "Hudit"
 
-#: src/gui/userpalette.cpp:145
-msgid "Portal Highlight"
-msgstr ""
-
 #: src/gui/userpalette.cpp:147
-msgid "Collision Highlight"
-msgstr ""
+msgid "Portal Highlight"
+msgstr "Siirtymän korostus"
 
 #: src/gui/userpalette.cpp:149
-msgid "Walkable Highlight"
+msgid "Default collision Highlight"
 msgstr ""
 
 #: src/gui/userpalette.cpp:151
-msgid "Local Player Attack Range"
+msgid "Air collision Highlight"
 msgstr ""
 
 #: src/gui/userpalette.cpp:153
-msgid "Local Player Attack Range Border"
+msgid "Water collision Highlight"
 msgstr ""
 
 #: src/gui/userpalette.cpp:155
-msgid "Monster Attack Range"
-msgstr ""
+msgid "Walkable Highlight"
+msgstr "Kuljettavan korostus"
 
 #: src/gui/userpalette.cpp:157
-msgid "Home Place"
-msgstr ""
+msgid "Local Player Attack Range"
+msgstr "Paikallispelaajan hyökkäyskantama"
 
 #: src/gui/userpalette.cpp:159
-msgid "Home Place Border"
-msgstr ""
+msgid "Local Player Attack Range Border"
+msgstr "Paikallispelaajan hyökkäyskantaman raja"
 
 #: src/gui/userpalette.cpp:161
+msgid "Monster Attack Range"
+msgstr "Hirviön hyökkäyskantama"
+
+#: src/gui/userpalette.cpp:163
+msgid "Home Place"
+msgstr "Kotipaikka"
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place Border"
+msgstr "Kotipaikan raja"
+
+#: src/gui/userpalette.cpp:167
 msgid "Road Point"
-msgstr ""
+msgstr "Väyläpiste"
 
 #: src/gui/whoisonline.cpp:70 src/gui/whoisonline.cpp:457
 msgid "Who Is Online - Updating"
-msgstr ""
+msgstr "Kuka on linjoila - päivitän"
 
 #: src/gui/whoisonline.cpp:90
 msgid "Update"
-msgstr ""
+msgstr "Päivitä"
 
 #: src/gui/whoisonline.cpp:283
 msgid "Who Is Online - "
-msgstr ""
+msgstr "Kuka on linjoilla - "
 
 #: src/gui/whoisonline.cpp:471
 msgid "Who Is Online - error"
-msgstr ""
+msgstr "Kuka on linjoilla - virhe"
 
 #: src/gui/whoisonline.cpp:502
 msgid "Who Is Online - Update"
-msgstr ""
+msgstr "Kuka on linjoilla - päivitä"
 
 #: src/gui/widgets/battletab.cpp:43
 msgid "Battle"
-msgstr ""
+msgstr "Taistelu"
 
 #: src/gui/widgets/channeltab.cpp:50
 msgid "/users > Lists the users in the current channel"
@@ -3304,11 +3378,11 @@ msgstr "Komento: /kick <nimi>"
 msgid "This command makes <nick> leave the channel."
 msgstr "Tämä komento poistaa annetunnimisen hahmon kanavalta."
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "Anna operaattoriksi korotettavan käyttäjän nimi!"
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr "Anna potkittavan käyttäjän nimi!"
 
@@ -3368,31 +3442,31 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:62
 msgid "BC"
-msgstr ""
+msgstr "BT"
 
 #: src/gui/windowmenu.cpp:62
 msgid "Bot checker"
-msgstr ""
+msgstr "Bottitutka"
 
 #: src/gui/windowmenu.cpp:64
 msgid "ONL"
-msgstr ""
+msgstr "LIN"
 
 #: src/gui/windowmenu.cpp:64
 msgid "Who is online"
-msgstr ""
+msgstr "Kuka on linjoilla"
 
 #: src/gui/windowmenu.cpp:66
 msgid "KS"
-msgstr ""
+msgstr "TT"
 
 #: src/gui/windowmenu.cpp:68
-msgid "Smiles"
+msgid "Smilies"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:70
 msgid "STA"
-msgstr ""
+msgstr "Tie"
 
 #: src/gui/windowmenu.cpp:70
 msgid "Status"
@@ -3400,41 +3474,41 @@ msgstr "Hahmon tiedot"
 
 #: src/gui/windowmenu.cpp:71
 msgid "EQU"
-msgstr ""
+msgstr "Var"
 
 #: src/gui/windowmenu.cpp:73
 msgid "INV"
-msgstr ""
+msgstr "Tav"
 
 #: src/gui/windowmenu.cpp:78
 msgid "SKI"
-msgstr ""
+msgstr "Tai"
 
-#: src/gui/windowmenu.cpp:84
+#: src/gui/windowmenu.cpp:85
 msgid "SPE"
-msgstr ""
+msgstr "Eri"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SOC"
-msgstr ""
+msgstr "Sos"
 
-#: src/gui/windowmenu.cpp:89
+#: src/gui/windowmenu.cpp:91
 msgid "SH"
-msgstr ""
+msgstr "PV"
 
-#: src/gui/windowmenu.cpp:89
+#: src/gui/windowmenu.cpp:91
 msgid "Shortcuts"
-msgstr ""
+msgstr "Pikavalinnat"
 
-#: src/gui/windowmenu.cpp:91
+#: src/gui/windowmenu.cpp:93
 msgid "SP"
-msgstr ""
+msgstr "Lo"
 
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:94
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SET"
 msgstr ""
 
@@ -3563,7 +3637,7 @@ msgstr ""
 #: src/keyboardconfig.cpp:346
 #, c-format
 msgid "Item Shortcut %d"
-msgstr "Esinepikavalinta %d"
+msgstr "Tavarapikavalinta %d"
 
 #: src/keyboardconfig.cpp:120
 msgid "Help Window"
@@ -3595,7 +3669,7 @@ msgstr "Keskusteluikkuna"
 
 #: src/keyboardconfig.cpp:132
 msgid "Item Shortcut Window"
-msgstr "Esineiden pikavalintaikkuna"
+msgstr "Tavaroiden pikavalintaikkuna"
 
 #: src/keyboardconfig.cpp:134
 msgid "Setup Window"
@@ -3754,11 +3828,11 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:288
 msgid "Crazy moves"
-msgstr ""
+msgstr "Villiliikkeet"
 
 #: src/keyboardconfig.cpp:290
 msgid "Change Crazy Move mode"
-msgstr ""
+msgstr "Muuta villiliiketilaa"
 
 #: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items from 0 slot"
@@ -3837,68 +3911,68 @@ msgstr ""
 "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
 "ole hyvä ja poista päällekkäisyydet. "
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:344
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1379
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1381
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1383
 msgid "Item is too far away"
 msgstr ""
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1385
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1387
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1390
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1393
 msgid "Unknown problem picking up item."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1383
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1417
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 
-#: src/localplayer.cpp:3099
+#: src/localplayer.cpp:3146
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3450
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3459
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3821
 msgid "You see "
 msgstr ""
 
@@ -3995,6 +4069,18 @@ msgstr ""
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Poista OpenGL käytöstä tämän session ajaksi"
 
+#: src/net/ea/buysellhandler.cpp:161
+msgid "Nothing to sell."
+msgstr "Ei mitään myytävää"
+
+#: src/net/ea/buysellhandler.cpp:169
+msgid "Thanks for buying."
+msgstr "Kiitos kaupoista."
+
+#: src/net/ea/buysellhandler.cpp:177
+msgid "Unable to buy."
+msgstr "Ostaminen epäonnistui."
+
 #: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:248
 msgid "Strength"
 msgstr "Voima"
@@ -4374,39 +4460,27 @@ msgstr "Kaupat peruttu."
 msgid "Trade completed."
 msgstr "Kaupat tuli."
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:68
 msgid "Kick failed!"
 msgstr "Potkiminen epäonnistui!"
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick succeeded!"
 msgstr "Potkiminen onnistui!"
 
-#: src/net/tmwa/buysellhandler.cpp:132
-msgid "Nothing to sell."
-msgstr "Ei mitään myytävää"
-
-#: src/net/tmwa/buysellhandler.cpp:139
-msgid "Thanks for buying."
-msgstr "Kiitos kaupoista."
-
-#: src/net/tmwa/buysellhandler.cpp:147
-msgid "Unable to buy."
-msgstr "Ostaminen epäonnistui."
-
-#: src/net/tmwa/buysellhandler.cpp:155
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Kiitos kaupoista."
 
-#: src/net/tmwa/buysellhandler.cpp:159
+#: src/net/tmwa/buysellhandler.cpp:133
 msgid "Unable to sell."
 msgstr "Myyminen epäonnistui."
 
-#: src/net/tmwa/buysellhandler.cpp:162
+#: src/net/tmwa/buysellhandler.cpp:136
 msgid "Unable to sell while trading."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:165
+#: src/net/tmwa/buysellhandler.cpp:139
 msgid "Unable to sell unsellable item."
 msgstr ""
 
@@ -4605,15 +4679,15 @@ msgstr "% Täysosuma"
 
 #: src/net/tmwa/generalhandler.cpp:262
 msgid "Attack Delay"
-msgstr ""
+msgstr "Hyökkäysviive"
 
 #: src/net/tmwa/generalhandler.cpp:264
 msgid "Walk Delay"
-msgstr ""
+msgstr "Kävelyviive"
 
 #: src/net/tmwa/generalhandler.cpp:266
 msgid "Attack Range"
-msgstr ""
+msgstr "Hyökkäyskantama"
 
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:67
 msgid "/help > Display this help."
@@ -4756,7 +4830,7 @@ msgstr "/kick > Potki pelaaja ryhmästäsi"
 
 #: src/net/tmwa/gui/partytab.cpp:71
 msgid "/item > Show/change party item sharing options"
-msgstr "/item > Näytä/muuta ryhmän esineidenjaon asetuksia"
+msgstr "/item > Näytä/muuta ryhmän tavaranjaon asetuksia"
 
 #: src/net/tmwa/gui/partytab.cpp:72
 msgid "/exp > Show/change party experience sharing options"
@@ -4776,7 +4850,7 @@ msgstr "Komento: /item <jakopolitiikka>"
 
 #: src/net/tmwa/gui/partytab.cpp:95
 msgid "This command changes the party's item sharing policy."
-msgstr "Tämä komento muuttaa ryhmän esineiden jakopolitiikkaa."
+msgstr "Tämä komento muuttaa ryhmän saaliinjakopolitiikkaa."
 
 #: src/net/tmwa/gui/partytab.cpp:96
 msgid ""
@@ -4784,7 +4858,7 @@ msgid ""
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 "<jakopolitiikka> voi olla arvoltaan \"1\", \"yes\" tai \"true\", jolloin "
-"esineet jaetaan, tai \"0\", \"no\" tai \"false\", jolloin esineitä ei jaeta."
+"saalis jaetaan, tai \"0\", \"no\" tai \"false\", jolloin saalista ei jaeta."
 
 #: src/net/tmwa/gui/partytab.cpp:99
 msgid "Command: /item"
@@ -4792,7 +4866,7 @@ msgstr "Komento: /item"
 
 #: src/net/tmwa/gui/partytab.cpp:100
 msgid "This command displays the party's current item sharing policy."
-msgstr "Tämä komento näyttää ryhmän nykyisen esineiden jakopolitiikan."
+msgstr "Tämä komento näyttää ryhmän nykyisen saaliinjakopolitiikan."
 
 #: src/net/tmwa/gui/partytab.cpp:105
 msgid "Command: /exp <policy>"
@@ -4821,19 +4895,19 @@ msgstr "Tämä komento näyttää ryhmän nykyisen kokemuksenjaon politiikan."
 
 #: src/net/tmwa/gui/partytab.cpp:146 src/net/tmwa/partyhandler.cpp:287
 msgid "Item sharing enabled."
-msgstr "Esineiden jakaminen käytössä."
+msgstr "Saaliinjako käytössä."
 
 #: src/net/tmwa/gui/partytab.cpp:149 src/net/tmwa/partyhandler.cpp:297
 msgid "Item sharing disabled."
-msgstr "Esineiden jakaminen poistettu käytöstä."
+msgstr "Saaliinjako poistettu käytöstä."
 
 #: src/net/tmwa/gui/partytab.cpp:152 src/net/tmwa/partyhandler.cpp:307
 msgid "Item sharing not possible."
-msgstr "Esineiden jakaminen ei ole mahdollista."
+msgstr "Saaliinjako ei ole mahdollista."
 
 #: src/net/tmwa/gui/partytab.cpp:155
 msgid "Item sharing unknown."
-msgstr "Esineiden jaon tila on tuntematon."
+msgstr "Saaliinjaon tila on tuntematon."
 
 #: src/net/tmwa/gui/partytab.cpp:185 src/net/tmwa/partyhandler.cpp:249
 msgid "Experience sharing enabled."
@@ -4853,11 +4927,11 @@ msgstr "Kokemuksen jaon tila on tuntematon."
 
 #: src/net/tmwa/inventoryhandler.cpp:376
 msgid "Failed to use item."
-msgstr "Esineen käyttö epäonnistui."
+msgstr "Tavaran käyttö ei onnistunut."
 
 #: src/net/tmwa/inventoryhandler.cpp:528
 msgid "Unable to equip."
-msgstr "Käyttöönotto epäonnistui."
+msgstr "Käyttöönotto ei onnistunut."
 
 #: src/net/tmwa/loginhandler.cpp:91
 msgid "Account was not found. Please re-login."
@@ -4891,7 +4965,7 @@ msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:178
 msgid "Client too old."
-msgstr ""
+msgstr "Liian vanha asiakasohjelma."
 
 #: src/net/tmwa/loginhandler.cpp:181
 #, c-format
@@ -4904,7 +4978,7 @@ msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:188
 msgid "Server overpopulated."
-msgstr ""
+msgstr "Palvelin on täynnä."
 
 #: src/net/tmwa/loginhandler.cpp:191
 msgid "This user name is already taken."
@@ -4912,7 +4986,7 @@ msgstr "Käyttäjätunnus on jo käytössä."
 
 #: src/net/tmwa/loginhandler.cpp:197
 msgid "Username permanently erased."
-msgstr ""
+msgstr "Käyttäjänimi pysyvästi poistettu."
 
 #: src/net/tmwa/network.cpp:149
 msgid "Empty address given to Network::connect()!"
@@ -4936,7 +5010,7 @@ msgstr "Ryhmä luotu."
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, c-format
-msgid "%s has join your party."
+msgid "%s has joined your party."
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:177
@@ -4956,13 +5030,13 @@ msgstr "%s on nyt ryhmäsi jäsen."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
 #, c-format
 msgid "QQQ Unknown invite response for %s."
-msgstr ""
+msgstr "QQQ Tuntematon kutsuvastaus kohteella %s."
 
 #: src/net/tmwa/partyhandler.cpp:357
 msgid "You have left the party."
@@ -5043,38 +5117,37 @@ msgstr "Olet entinen pelaaja."
 msgid "You're pining for the fjords."
 msgstr "Kaipaat kotivuonoille."
 
-#: src/net/tmwa/playerhandler.cpp:332 src/net/tmwa/playerhandler.cpp:342
-#: src/net/tmwa/playerhandler.cpp:421
+#: src/net/tmwa/playerhandler.cpp:340 src/net/tmwa/playerhandler.cpp:350
+#: src/net/tmwa/playerhandler.cpp:429
 msgid "Message"
 msgstr "Viesti"
 
-#: src/net/tmwa/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:341
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
 
-#: src/net/tmwa/playerhandler.cpp:343
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+#: src/net/tmwa/playerhandler.cpp:351
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:456
 #, c-format
 msgid "You picked up %s."
-msgstr "%s noukittu."
+msgstr "%s nostettu."
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, c-format
 msgid "You spent %s."
-msgstr ""
+msgstr "Käytit %s."
 
-#: src/net/tmwa/playerhandler.cpp:499
+#: src/net/tmwa/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr "Taidon korottaminen epäonnistui!"
 
-#: src/net/tmwa/playerhandler.cpp:619
+#: src/net/tmwa/playerhandler.cpp:627
 msgid "Equip arrows first."
 msgstr "Varusta ensin nuolia."
 
@@ -5187,23 +5260,19 @@ msgstr "Käsittelemätön kaupan peruutus -paketti."
 #: src/net/tmwa/tradehandler.cpp:248
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
-"Esineen lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
+"Tavaran lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
 
 #: src/net/tmwa/tradehandler.cpp:253
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Esineen lisääminen epäonnistui; kauppakumppanilla ei ole tilaa sille."
+msgstr "Tavaran lisääminen epäonnistui; kauppakumppanilla ei ole tilaa sille."
 
 #: src/net/tmwa/tradehandler.cpp:258
-msgid "Failed adding item. You cant trade this item."
+msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
 #: src/net/tmwa/tradehandler.cpp:262
 msgid "Failed adding item for unknown reason."
-msgstr "Esineen lisääminen epäonnistui tuntemattomasta syystä."
-
-#: src/playerrelations.cpp:404
-msgid "Completely ignore"
-msgstr "Jätä täysin huomiotta"
+msgstr "Tavaran lisääminen epäonnistui tuntemattomasta syystä."
 
 #: src/playerrelations.cpp:418
 msgid "Print '...'"
@@ -5221,8 +5290,8 @@ msgstr "Leijuva '...' -puhekupla"
 msgid "Floating bubble"
 msgstr "Leijuva puhekupla"
 
-#: src/resources/beinginfo.cpp:33 src/resources/itemdb.cpp:239
-#: src/resources/monsterdb.cpp:79
+#: src/resources/beinginfo.cpp:33 src/resources/itemdb.cpp:243
+#: src/resources/monsterdb.cpp:82
 msgid "unnamed"
 msgstr "nimetön"
 
@@ -5248,4 +5317,6 @@ msgstr "MP %+d"
 
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
-msgstr "Tuntematon esine"
+msgstr "Tuntematon tavara"
+
+
diff --git a/po/fr.po b/po/fr.po
index cbb13ca85..bfec16548 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,21 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+#   <antoinebcn@hotmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
-"PO-Revision-Date: 2011-05-09 22:37+0000\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"PO-Revision-Date: 2011-05-22 14:06+0000\n"
 "Last-Translator: Jumpy <antoinebcn@hotmail.com>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
-"fr/)\n"
-"Language: fr\n"
+"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:1028
@@ -122,16 +121,16 @@ msgstr "Commande inconnue."
 
 #: src/commandhandler.cpp:399
 msgid "Cannot send empty whispers!"
-msgstr "Vous ne pouvez pas envoyer des messages privés vides."
+msgstr "Vous ne pouvez pas envoyer de messages vides."
 
 #: src/commandhandler.cpp:407
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
-"\". Soit elle existe déjà, soit il s'agit de vous même."
+"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom "
+"\"%s\". Soit elle existe déjà, soit il s'agit de vous même."
 
 #: src/commandhandler.cpp:427
 #, c-format
@@ -157,16 +156,16 @@ msgstr "La touche <entrée> ferme la ligne d'entrée du chat."
 
 #: src/commandhandler.cpp:508
 msgid "Message closes chat."
-msgstr "Ce message ferme la conversation."
+msgstr "Le message ferme la conversation."
 
 #: src/commandhandler.cpp:519
 msgid "Return now toggles chat."
 msgstr ""
-"La touche <enteée> ferme maintenant la ligne d'entrée de la conversation."
+"La touche <entrée> ferme maintenant la ligne d'entrée de la conversation."
 
 #: src/commandhandler.cpp:525
 msgid "Message now closes chat."
-msgstr "Ce message ferme maintenant la conversation."
+msgstr "Le message ferme maintenant la conversation."
 
 #: src/commandhandler.cpp:553
 msgid "friend"
@@ -256,12 +255,12 @@ msgstr[1] "%d minutes"
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "%d segondes"
+msgstr[0] "%d secondes"
 msgstr[1] "%d secondes"
 
 #: src/commandhandler.cpp:1080
 msgid "font cache size"
-msgstr "Cache de polices"
+msgstr "Taille du cache de polices"
 
 #: src/commandhandler.cpp:1092
 msgid "Cache size:"
@@ -277,18 +276,16 @@ msgstr "Effacé :"
 
 #: src/commandhandler.cpp:1145 src/commandhandler.cpp:1152
 msgid "Resource images:"
-msgstr ""
+msgstr "Images des ressources :"
 
 #: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
 msgid "Resource orphaned images:"
-msgstr ""
+msgstr "Images des ressources non affectées :"
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true"
-"\", \"false\", \"1\", \"0\"."
+msgstr "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #: src/game.cpp:232 src/gui/widgets/chattab.cpp:398
 msgid "General"
@@ -300,11 +297,11 @@ msgstr "Informations"
 
 #: src/game.cpp:449
 msgid "Screenshot saved as "
-msgstr "Capture d'écran sauvegardée en tant que"
+msgstr "Capture d'écran sauvegardée sous"
 
 #: src/game.cpp:457
 msgid "Saving screenshot failed!"
-msgstr "Impossible de sauvegarder la capture d'écran !"
+msgstr "La sauvegarde de la capture d'écran a échoué !"
 
 #: src/game.cpp:496
 msgid "The connection to the server was lost."
@@ -325,7 +322,7 @@ msgstr "Accepter les requêtes d'échanges entrantes"
 
 #: src/game.cpp:1410
 msgid "Could Not Load Map"
-msgstr "La carte n'a pu être chargé"
+msgstr "La carte n'a pu être chargée"
 
 #: src/game.cpp:1411
 #, c-format
@@ -349,7 +346,7 @@ msgstr "Rang PvP : %d"
 
 #: src/gui/botcheckerwindow.cpp:264
 msgid "Bot Checker"
-msgstr "Contrôle Robot"
+msgstr "Testeur de Robot"
 
 #: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:60
 msgid "Name"
@@ -424,7 +421,7 @@ msgstr "Max."
 #: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
-msgstr "Magasin"
+msgstr "Boutique"
 
 #: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:245
 #: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:424
@@ -441,10 +438,10 @@ msgstr "Vendre"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -509,11 +506,11 @@ msgstr "Le mot de passe ne doit pas être plus long que %d caractères."
 
 #: src/gui/changepassworddialog.cpp:132
 msgid "The new password entries mismatch."
-msgstr "Les nouveaux mots de passe entrés ne correspondent pas."
+msgstr "Les nouveaux mots de passe ne correspondent pas."
 
 #: src/gui/charcreatedialog.cpp:56
 msgid "Create Character"
-msgstr "Création du personnage"
+msgstr "Créer le personnage"
 
 #: src/gui/charcreatedialog.cpp:71 src/gui/logindialog.cpp:91
 #: src/gui/register.cpp:73
@@ -591,7 +588,7 @@ msgstr "Gestion du compte et du personnage"
 
 #: src/gui/charselectdialog.cpp:137
 msgid "Switch Login"
-msgstr "Changer de login"
+msgstr "Changer de compte"
 
 #: src/gui/charselectdialog.cpp:151 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:56
@@ -608,7 +605,7 @@ msgstr "Mot de passe incorrect"
 
 #: src/gui/charselectdialog.cpp:285
 msgid "Enter password for deleting character"
-msgstr "Entrer le mot de passe pour éliminer le personnage"
+msgstr "Entrer le mot de passe pour effacer le personnage"
 
 #: src/gui/charselectdialog.cpp:285
 msgid "Enter password:"
@@ -709,7 +706,7 @@ msgstr "Présents : %s ; %d joueurs sont présents."
 #: src/gui/chatwindow.cpp:969
 #, c-format
 msgid "Whispering to %s: %s"
-msgstr "Message privé envoyé à %s : %s"
+msgstr "Message envoyé à %s : %s"
 
 #: src/gui/confirmdialog.cpp:45
 msgid "Yes"
@@ -736,135 +733,131 @@ msgstr "Cible"
 
 #: src/gui/debugwindow.cpp:70
 msgid "Net"
-msgstr "Net"
+msgstr "Réseau"
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 msgid "Music:"
 msgstr "Musique :"
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 msgid "Map:"
 msgstr "Carte :"
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 msgid "Minimap:"
 msgstr "Mini carte :"
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr "Curseur : (%d, %d)"
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+msgid "Cursor:"
+msgstr "Curseur :"
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 msgid "Player Position:"
 msgstr "Position du joueur :"
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, c-format
-msgid "Particle count: %d"
-msgstr "Effets de particules : %d"
+#: src/gui/debugwindow.cpp:140
+msgid "Particle count:"
+msgstr "Comptage de particules :"
 
-#: src/gui/debugwindow.cpp:141
-#, c-format
-msgid "Map actors count: %d"
-msgstr "Nombre d'agents interactifs sur la carte : %d"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
+msgstr "Nombre d'acteurs sur la carte :"
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Logiciel)"
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (OpenGl rapide)"
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (ancien OpenGL)"
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
 msgstr "Comptage des trames :"
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-msgid "Cursor:"
-msgstr "Curseur :"
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
-msgstr "Nombre d'acteurs sur la carte :"
+#: src/gui/debugwindow.cpp:219
+#, c-format
+msgid "Particle count: %d"
+msgstr "Effets de particules : %d"
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 msgid "Target:"
 msgstr "Cible :"
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 msgid "Target Id:"
 msgstr "Id de la Cible :"
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 msgid "Target Level:"
-msgstr "Choisir le niveau :"
+msgstr "Cibler un niveau :"
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 msgid "Target Party:"
-msgstr "Choisir le Groupe :"
+msgstr "Cibler un groupe :"
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 msgid "Target Guild:"
-msgstr "Choisir la Guilde :"
+msgstr "Cibler une guilde :"
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 msgid "Attack delay:"
-msgstr "Retard attaque :"
+msgstr "Délai d'attaque :"
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 msgid "Minimal hit:"
 msgstr "Coup Mini :"
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
-msgstr "Coup Maxi :"
+msgstr "Coup Max :"
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 msgid "Critical hit:"
 msgstr "Coup Critique :"
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr "Ping : %d ms"
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr "Ping : ? ms"
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrée : %d bytes/s"
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Sortie : %d bytes/s"
@@ -881,8 +874,8 @@ msgstr "Équipement"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Retirer"
 
@@ -903,7 +896,7 @@ msgstr "Inventaire"
 
 #: src/gui/inventorywindow.cpp:101
 msgid "Slots:"
-msgstr "Cases :"
+msgstr "Emplacements :"
 
 #: src/gui/inventorywindow.cpp:112
 msgid "Filter:"
@@ -911,7 +904,7 @@ msgstr "Filtre :"
 
 #: src/gui/inventorywindow.cpp:113
 msgid "Sort:"
-msgstr "Classer par :"
+msgstr "Tri :"
 
 #: src/gui/inventorywindow.cpp:119
 msgid "na"
@@ -926,26 +919,26 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Équiper"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Utiliser"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 msgid "Drop..."
 msgstr "Jeter..."
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Partager"
 
@@ -959,17 +952,17 @@ msgid "Weight:"
 msgstr "Poids :"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Entreposer"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Jeter"
@@ -980,7 +973,7 @@ msgstr "Tout"
 
 #: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
-msgstr "Choisir le nombre d'objets à troquer."
+msgstr "Choisir le nombre d'objets à échanger."
 
 #: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
@@ -1000,11 +993,11 @@ msgstr "Choisir le nombre d'objets à séparer."
 
 #: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
-msgstr "Ajouter au magasin d'achats."
+msgstr "Ajouter à la boutique d'achats."
 
 #: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
-msgstr "Ajouter au magasin de ventes."
+msgstr "Ajouter à la boutique de ventes."
 
 #: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
@@ -1069,7 +1062,7 @@ msgstr "Temps avant prochain niveau sur 1 min : ?"
 
 #: src/gui/killstats.cpp:81
 msgid "Exp speed per 5 min: ?"
-msgstr "Exp obtenue en 5 min : ?"
+msgstr "Exp. obtenue en 5 min : ?"
 
 #: src/gui/killstats.cpp:82
 msgid "Time for next level per 5 min: ?"
@@ -1077,7 +1070,7 @@ msgstr "Temps avant prochain niveau sur 5 min : ?"
 
 #: src/gui/killstats.cpp:83
 msgid "Exp speed per 15 min: ?"
-msgstr "Exp obtenue en 15 min : ?"
+msgstr "Exp. obtenue en 15 min : ?"
 
 #: src/gui/killstats.cpp:84
 msgid "Time for Next level per 15 min: ?"
@@ -1085,7 +1078,7 @@ msgstr "Temps avant prochain niveau sur 15 min : ?"
 
 #: src/gui/killstats.cpp:86
 msgid "Last kill exp: ?"
-msgstr "Dernière Exp obtenue : ?"
+msgstr "Dernière Exp. obtenue : ?"
 
 #: src/gui/killstats.cpp:87
 msgid "Time before jacko spawn: ?"
@@ -1147,7 +1140,7 @@ msgstr "Sauter"
 
 #: src/gui/logindialog.cpp:84 src/gui/logindialog.cpp:120
 msgid "Login"
-msgstr "Connexion"
+msgstr "Compte"
 
 #: src/gui/logindialog.cpp:88 src/gui/serverdialog.cpp:241
 #: src/gui/widgets/chattab.cpp:171
@@ -1196,7 +1189,7 @@ msgstr "Barre de poids"
 
 #: src/gui/ministatus.cpp:92
 msgid "inventory slots bar"
-msgstr "Barre case d'inventaire"
+msgstr "Barre emplacements d'inventaire"
 
 #: src/gui/ministatus.cpp:95
 msgid "money bar"
@@ -1208,7 +1201,7 @@ msgstr "Barre de flèches"
 
 #: src/gui/ministatus.cpp:101
 msgid "status bar"
-msgstr "Barre de Status"
+msgstr "Barre de Statut"
 
 #: src/gui/ministatus.cpp:287 src/gui/ministatus.cpp:327
 msgid "Need"
@@ -1234,8 +1227,7 @@ msgstr "PNJ"
 msgid "Clear"
 msgstr "Effacer"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 msgid "> Next"
 msgstr ">suivant"
 
@@ -1277,7 +1269,7 @@ msgstr "Échange"
 
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:345
 msgid "Whisper"
-msgstr "Message privé"
+msgstr "Message"
 
 #: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:585
 msgid "Heal"
@@ -1294,7 +1286,7 @@ msgstr "Être ami"
 #: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
 #: src/gui/popupmenu.cpp:626
 msgid "Disregard"
-msgstr "Eviter"
+msgstr "Éviter"
 
 #: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:152
 #: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:168
@@ -1303,7 +1295,7 @@ msgstr "Eviter"
 #: src/gui/popupmenu.cpp:597 src/gui/popupmenu.cpp:605
 #: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:619
 msgid "Erase"
-msgstr "Eliminer"
+msgstr "Éliminer"
 
 #: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:166
 #: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:365
@@ -1360,21 +1352,20 @@ msgstr "Sortir le joueur"
 
 #: src/gui/popupmenu.cpp:235
 msgid "Nuke"
-msgstr "Anihiller"
+msgstr "Annihiler"
 
 #: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:639
-#, fuzzy
 msgid "Show Items"
-msgstr "Afficher le niveau"
+msgstr "Montrer les objets"
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
 msgstr "Déshabiller"
 
 #: src/gui/popupmenu.cpp:270
 msgid "Kick"
-msgstr "Sortir"
+msgstr "Virer"
 
 #: src/gui/popupmenu.cpp:281
 msgid "Remove from attack list"
@@ -1400,8 +1391,8 @@ msgstr "Ajouter le nom dans la boite de dialogue"
 msgid "Pick up"
 msgstr "Ramasser"
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
@@ -1413,8 +1404,8 @@ msgstr "Objet de carte"
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 msgid "Remove"
 msgstr "Enlever"
 
@@ -1466,84 +1457,86 @@ msgstr "Quitter"
 msgid "Change guild position"
 msgstr "Changer la position de la Guilde"
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte"
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr "Nom : "
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 msgid "Add to trade"
-msgstr "Ajouter dans l'échange"
+msgstr "Ajouter à la transaction"
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 msgid "Store 10"
 msgstr "Entreposer 10"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 msgid "Store all"
 msgstr "Entreposer tout"
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr "Charger les anciens raccourcis d'objets"
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr "Charger les anciens raccourcis de jets d'objets"
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr "Cacher"
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr "Montrer"
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 msgid "(default)"
 msgstr "(défaut)"
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 msgid "Move up"
 msgstr "Aller vers le haut"
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -1565,7 +1558,7 @@ msgstr "Vérification :"
 
 #: src/gui/register.cpp:106
 msgid "Email:"
-msgstr "Email :"
+msgstr "E-mail :"
 
 #: src/gui/register.cpp:174
 #, c-format
@@ -1638,7 +1631,7 @@ msgstr "Préparation du téléchargement"
 
 #: src/gui/serverdialog.cpp:561
 msgid "Error retreiving server list!"
-msgstr "Erreur lors du téléchargement de la liste !"
+msgstr "Erreur lors du téléchargement de la liste de serveur !"
 
 #: src/gui/serverdialog.cpp:659
 msgid "requires a newer version"
@@ -1659,7 +1652,7 @@ msgstr "Activer les effets sonores du jeu"
 
 #: src/gui/setup_audio.cpp:50
 msgid "Enable gui sfx"
-msgstr "Activer les effets sonores de l'interface"
+msgstr "Activer les effets spéciaux de l'interface"
 
 #: src/gui/setup_audio.cpp:51
 msgid "Enable music"
@@ -1667,7 +1660,7 @@ msgstr "Activer la musique"
 
 #: src/gui/setup_audio.cpp:52
 msgid "Enable mumble voice chat"
-msgstr "Activer le chat avec Mumble"
+msgstr "Activer le chat avec mumble"
 
 #: src/gui/setup_audio.cpp:54
 msgid "Download music"
@@ -1687,13 +1680,12 @@ msgstr "Volume de la musique"
 
 #: src/gui/setup_audio.cpp:118
 msgid "Notice"
-msgstr "Message"
+msgstr "Notice"
 
 #: src/gui/setup_audio.cpp:118
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
-"Le client devra être redémarré afin de vous permettre de télécharger la "
-"musique."
+"Le client devra être redémarré si vous téléchargez une nouvelle musique."
 
 #: src/gui/setup_audio.cpp:131
 msgid "Sound Engine"
@@ -1705,15 +1697,15 @@ msgstr "Retirer les couleurs des messages de chat"
 
 #: src/gui/setup_chat.cpp:70
 msgid "Log magic messages in debug tab"
-msgstr "Enregistrer les messages liés à la magie dans 'informations'"
+msgstr "Messages de magie dans l'onglet \"informations\""
 
 #: src/gui/setup_chat.cpp:77
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr "Permettre la magie et les commandes GM dans tous les tabs de chat"
+msgstr "Messages de magie et commandes GM dans tous les onglets du chat"
 
 #: src/gui/setup_chat.cpp:82
 msgid "Show server messages in debug tab"
-msgstr "Afficher les messages du serveur dans le tab 'informations'"
+msgstr "Afficher les messages du serveur dans l'onglet \"informations\""
 
 #: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
@@ -1725,11 +1717,11 @@ msgstr "Activer la boite de dialogue d'échanges"
 
 #: src/gui/setup_chat.cpp:94
 msgid "Hide shop messages"
-msgstr "Masquer les messages liés au magasin"
+msgstr "Masquer les messages liés à la boutique"
 
 #: src/gui/setup_chat.cpp:98
 msgid "Show chat history"
-msgstr "Montrer l'historique de discussion"
+msgstr "Afficher l'historique de discussion"
 
 #: src/gui/setup_chat.cpp:102
 msgid "Enable battle tab"
@@ -1746,15 +1738,15 @@ msgstr "Montrer la liste des couleurs de chat"
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
 #: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
-msgstr "Editer"
+msgstr "Éditer"
 
 #: src/gui/setup_chat.cpp:116
 msgid "Limit max chars in chat line"
-msgstr "Limiter le nombre maximum de caractères d'une ligne de discussion"
+msgstr "Limiter le nbre max de car d'une ligne de discussion"
 
 #: src/gui/setup_chat.cpp:125
 msgid "Limit max lines in chat"
-msgstr "Limiter le nombre maximum de lignes dans le chat"
+msgstr "Limiter le nbre max de lignes dans le chat"
 
 #: src/gui/setup_chat.cpp:132
 msgid "Resize chat tabs if need"
@@ -1829,11 +1821,11 @@ msgstr "Calibrer"
 
 #: src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
-msgstr "Activer le joystick"
+msgstr "Activer la manette de jeu"
 
 #: src/gui/setup_joystick.cpp:42
 msgid "Joystick"
-msgstr "Joystick"
+msgstr "Manette"
 
 #: src/gui/setup_joystick.cpp:82
 msgid "Stop"
@@ -1841,7 +1833,7 @@ msgstr "Stop"
 
 #: src/gui/setup_joystick.cpp:83
 msgid "Rotate the stick"
-msgstr "Tourner le joystick"
+msgstr "Tourner la manette de jeu"
 
 #: src/gui/setup_keyboard.cpp:78
 msgid "Keyboard"
@@ -1861,7 +1853,7 @@ msgstr "Par défaut"
 
 #: src/gui/setup_keyboard.cpp:131
 msgid "Key Conflict(s) Detected."
-msgstr "Conflit(s) de touche détecté"
+msgstr "Conflit(s) de touche détecté(s)"
 
 #: src/gui/setup_other.cpp:101
 msgid "Misc"
@@ -1873,7 +1865,7 @@ msgstr "Montrer les dégâts infligés aux monstres"
 
 #: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
-msgstr "Viser automatiquement  juste les monstres à portée de tir "
+msgstr "Ne viser en auto que les monstres à portée de tir "
 
 #: src/gui/setup_other.cpp:113
 msgid "Highlight map portals"
@@ -1889,15 +1881,15 @@ msgstr "Afficher la portée d'attaque des monstres"
 
 #: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
-msgstr "Mettre un cercle autour des joueurs ciblés pour l'attaque"
+msgstr "Entourer les joueurs visés"
 
 #: src/gui/setup_other.cpp:130
 msgid "Cycle monster targets"
-msgstr "Mettre un cercle autour des joueurs ciblés pour l'attaque "
+msgstr "Entourer les monstres visés"
 
 #: src/gui/setup_other.cpp:133
 msgid "Enable bot checker"
-msgstr "Activer le contrôle de robots"
+msgstr "Activer le testeur de robots"
 
 #: src/gui/setup_other.cpp:136
 msgid "Highlight floor items"
@@ -1905,15 +1897,15 @@ msgstr "Mettre en évidence les items sur le sol"
 
 #: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
-msgstr "Programme A de mouvement de dingue"
+msgstr "Programme A de mouvement de fou"
 
 #: src/gui/setup_other.cpp:150
 msgid "Enable shop mode"
-msgstr "Activer le mode magasin"
+msgstr "Activer le mode boutique"
 
 #: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
-msgstr "Activer la protection contre les serveurs buggés"
+msgstr "Activer la protection contre les serveurs instables"
 
 #: src/gui/setup_other.cpp:156
 msgid "Enable debug log"
@@ -1925,7 +1917,7 @@ msgstr "Activer l'attaque de la part du serveur"
 
 #: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
-msgstr "Auto-correction de la position"
+msgstr "Auto-correction de position"
 
 #: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
@@ -1937,7 +1929,7 @@ msgstr "Activer les statistiques instantanées"
 
 #: src/gui/setup_other.cpp:171
 msgid "Show warps particles"
-msgstr "Montrer les effets de particules de déplacement"
+msgstr "Montrer les effets de déplacement"
 
 #: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
@@ -1945,7 +1937,7 @@ msgstr "Accepter les requêtes d'achat et de vente"
 
 #: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
-msgstr "Afficher la bar de vie des monstres"
+msgstr "Afficher la barre de vie des monstres"
 
 #: src/gui/setup_other.cpp:180
 msgid "Show own hp bar"
@@ -1953,7 +1945,7 @@ msgstr "Afficher votre propre barre de vie"
 
 #: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
-msgstr "Afficher les messages d'expérience pour les points de compétences"
+msgstr "Afficher les expériences de compétences"
 
 #: src/gui/setup_other.cpp:186
 msgid "Show players popups"
@@ -2053,7 +2045,7 @@ msgstr "Taille des effets de particules"
 
 #: src/gui/setup_theme.cpp:113
 msgid "Help font"
-msgstr "Taille de l'aide"
+msgstr "Police de l'aide"
 
 #: src/gui/setup_theme.cpp:223
 msgid "Theme Changed"
@@ -2142,7 +2134,7 @@ msgstr "Plein écran"
 
 #: src/gui/setup_video.cpp:278
 msgid "Hw acceleration"
-msgstr "Accélération Hw"
+msgstr "Accélération matériel"
 
 #: src/gui/setup_video.cpp:279
 msgid "Custom cursor"
@@ -2158,7 +2150,7 @@ msgstr "Effets de particules"
 
 #: src/gui/setup_video.cpp:285
 msgid "Log NPC dialogue"
-msgstr "Enregistrer les conversations avec les PNJ"
+msgstr "Enregistrer les conversations des PNJ"
 
 #: src/gui/setup_video.cpp:286
 msgid "Show pickup notification"
@@ -2176,7 +2168,7 @@ msgstr "avec des particules"
 
 #: src/gui/setup_video.cpp:292
 msgid "Hide shield sprite"
-msgstr "Cacher le sprite du bouclier"
+msgstr "Cacher le bouclier"
 
 #: src/gui/setup_video.cpp:294
 msgid "Low traffic mode"
@@ -2200,7 +2192,7 @@ msgstr "Afficher les compétences"
 
 #: src/gui/setup_video.cpp:302
 msgid "Enable opacity cache"
-msgstr "Activer le cache de transparence"
+msgstr "Activer le cache transparence"
 
 #: src/gui/setup_video.cpp:303
 msgid "Show background"
@@ -2279,7 +2271,7 @@ msgstr ""
 
 #: src/gui/setup_video.cpp:703
 msgid "Custom resolution (example: 1024x768)"
-msgstr "Résolution personalisée (Exemple : 1024x768)"
+msgstr "Résolution personnalisée (Exemple : 1024x768)"
 
 #: src/gui/setup_video.cpp:704
 msgid "Enter new resolution:                "
@@ -2305,7 +2297,7 @@ msgstr "Les changements seront appliqués au changement de carte."
 
 #: src/gui/shopwindow.cpp:72
 msgid "Personal Shop"
-msgstr "Magasin personnel"
+msgstr "Boutique personnelle"
 
 #: src/gui/shopwindow.cpp:114
 msgid "Buy items"
@@ -2445,7 +2437,7 @@ msgstr "Atq"
 
 #: src/gui/socialwindow.cpp:824
 msgid "Priority mobs"
-msgstr "Priorité sur les monstres"
+msgstr "Monstres prioritaires"
 
 #: src/gui/socialwindow.cpp:856
 msgid "Attack mobs"
@@ -2512,8 +2504,8 @@ msgstr "Choisissez le nom de la guilde."
 #: src/gui/socialwindow.cpp:1293
 msgid "Received guild request, but one already exists."
 msgstr ""
-"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
-"dans une."
+"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà"
+" dans une."
 
 #: src/gui/socialwindow.cpp:1299
 #, c-format
@@ -2595,7 +2587,7 @@ msgstr "(?) Mouvements"
 
 #: src/gui/statuspopup.cpp:237
 msgid "(a) custom crazy move"
-msgstr "(a) Personnaliser les mouvements fous"
+msgstr "(a) Mouvements fous personnalisés"
 
 #: src/gui/statuspopup.cpp:241
 msgid "(?) crazy move"
@@ -2603,35 +2595,35 @@ msgstr "(?) Mouvements fous"
 
 #: src/gui/statuspopup.cpp:251
 msgid "(0) default moves to target"
-msgstr "(0) Aller vers la cible distance par défaut"
+msgstr "(0) Aller à la cible distante par défaut"
 
 #: src/gui/statuspopup.cpp:256
 msgid "(1) moves to target in distance 1"
-msgstr "(1) Aller vers la cible en distance 1"
+msgstr "(1) Aller à la cible en distante de 1"
 
 #: src/gui/statuspopup.cpp:261
 msgid "(2) moves to target in distance 2"
-msgstr "(2) Aller vers la cible en distance 2"
+msgstr "(2) Aller vers la cible jusqu'à 2 de distance"
 
 #: src/gui/statuspopup.cpp:266
 msgid "(3) moves to target in distance 3"
-msgstr "(3) Aller vers la cible en distance 3"
+msgstr "(3)  Aller à la cible en distante de 3"
 
 #: src/gui/statuspopup.cpp:271
 msgid "(5) moves to target in distance 5"
-msgstr "(5) Aller vers la cible en distance 5"
+msgstr "(5)  Aller à la cible en distante de 5"
 
 #: src/gui/statuspopup.cpp:276
 msgid "(7) moves to target in distance 7"
-msgstr "(7) Aller vers la cible en distance 7"
+msgstr "(7) Aller à la cible en distante de 7"
 
 #: src/gui/statuspopup.cpp:281
 msgid "(A) moves to target in attack range"
-msgstr "(A) Aller vers la cible dans le champs d'attaque"
+msgstr "(A) Aller à la cible dans le champ d'attaque"
 
 #: src/gui/statuspopup.cpp:286
 msgid "(?) move to target"
-msgstr "(?) Aller vers la cible"
+msgstr "(?) Aller à la cible"
 
 #: src/gui/statuspopup.cpp:294
 msgid "(D) default follow"
@@ -2639,7 +2631,7 @@ msgstr "(D) Suivre : défaut"
 
 #: src/gui/statuspopup.cpp:298
 msgid "(R) relative follow"
-msgstr "(R) Suivre de près"
+msgstr "(R) Suivre: mouvement relatif"
 
 #: src/gui/statuspopup.cpp:302
 msgid "(M) mirror follow"
@@ -2683,31 +2675,31 @@ msgstr "(d) Sans attaque automatique"
 
 #: src/gui/statuspopup.cpp:372
 msgid "(S) small pick up 1x1 cells"
-msgstr "(S) Ramassage 1x1"
+msgstr "(S) Ramassage sur 1x1 case"
 
 #: src/gui/statuspopup.cpp:376
 msgid "(D) default pick up 2x1 cells"
-msgstr "(D) Ramassage par défaut 2x1"
+msgstr "(D) Ramassage par défaut sur 2x1 cases"
 
 #: src/gui/statuspopup.cpp:380
 msgid "(F) forward pick up 2x3 cells"
-msgstr "(F) Ramassage avant 2x3"
+msgstr "(F) Ramassage avant sur  2x3 cases"
 
 #: src/gui/statuspopup.cpp:384
 msgid "(3) pick up 3x3 cells"
-msgstr "(3) Ramassage 3x3"
+msgstr "(3) Ramassage sur 3x3 cases"
 
 #: src/gui/statuspopup.cpp:388
 msgid "(g) go and pick up in distance 4"
-msgstr "(g) Se déplacer pour ramasser distance 4"
+msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
 
 #: src/gui/statuspopup.cpp:392
 msgid "(G) go and pick up in distance 8"
-msgstr "(G) Se déplacer pour ramasser distance 8"
+msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
 
 #: src/gui/statuspopup.cpp:396
 msgid "(A) go and pick up in max distance"
-msgstr "(A) Se déplacer pour ramasser distance max"
+msgstr "(A) Aller et ramasser jusqu'à la distance max"
 
 #: src/gui/statuspopup.cpp:400
 msgid "(?) pick up"
@@ -2715,11 +2707,11 @@ msgstr "(?) Ramassage"
 
 #: src/gui/statuspopup.cpp:409
 msgid "(N) normal map view"
-msgstr "(N) Vue normal du jeu"
+msgstr "(N) Vue normale du jeu"
 
 #: src/gui/statuspopup.cpp:413
 msgid "(D) debug map view"
-msgstr "(D) Vue du jeu mode information"
+msgstr "(D) Vue du jeu mode déverminage"
 
 #: src/gui/statuspopup.cpp:417
 msgid "(u) ultra map view"
@@ -2783,11 +2775,11 @@ msgstr "(O) Présent sur le jeu"
 
 #: src/gui/statuspopup.cpp:494
 msgid "(A) away"
-msgstr "(A) Mode absence"
+msgstr "(A) Absent"
 
 #: src/gui/statuspopup.cpp:497 src/gui/statuspopup.cpp:517
 msgid "(?) away"
-msgstr "(?) Mode absence"
+msgstr "(?) Absent"
 
 #: src/gui/statuspopup.cpp:505
 msgid "(G) game camera mode"
@@ -2799,15 +2791,15 @@ msgstr "(F) Mode camera libre"
 
 #: src/gui/statuspopup.cpp:513
 msgid "(D) design camera mode"
-msgstr "(D) Définr le mode camera"
+msgstr "(D) Définir le mode camera"
 
 #: src/gui/statuspopup.cpp:524
 msgid "Game modifiers are disabled"
-msgstr "Les modifications sur le mode jeu sont désactivées"
+msgstr "Modificateurs de mode de jeu désactivés"
 
 #: src/gui/statuspopup.cpp:529
 msgid "Game modifiers are enabled"
-msgstr "Les modifications sur le mode jeu sont activées"
+msgstr "Modificateurs de mode de jeu activés"
 
 #: src/gui/statuswindow.cpp:131 src/gui/statuswindow.cpp:257
 #: src/gui/statuswindow.cpp:320
@@ -2998,7 +2990,7 @@ msgstr "Nécessite une cible"
 
 #: src/gui/textcommandeditor.cpp:117
 msgid "General Magic"
-msgstr "Les bases de la magie"
+msgstr "Magie générale"
 
 #: src/gui/textcommandeditor.cpp:118
 msgid "Life Magic"
@@ -3010,7 +3002,7 @@ msgstr "Magie de Guerre"
 
 #: src/gui/textcommandeditor.cpp:120
 msgid "Transmute Magic"
-msgstr "Magie de Transformation"
+msgstr "Magie de Transmutation"
 
 #: src/gui/textcommandeditor.cpp:121
 msgid "Nature Magic"
@@ -3102,7 +3094,8 @@ msgid "Change"
 msgstr "Changer"
 
 #: src/gui/tradewindow.cpp:314
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
 "dans cette fenêtre."
@@ -3224,7 +3217,7 @@ msgstr "Barre de vie du joueur (Couleur secondaire)"
 
 #: src/gui/userpalette.cpp:135
 msgid "Player Hits Monster"
-msgstr "Coups de joueurs sur les montres"
+msgstr "Coups des joueurs sur les montres"
 
 #: src/gui/userpalette.cpp:136
 msgid "Monster Hits Player"
@@ -3256,19 +3249,19 @@ msgstr "Coups manqués"
 
 #: src/gui/userpalette.cpp:147
 msgid "Portal Highlight"
-msgstr "Surbrillance des portes d'entrée et de sortie"
+msgstr "Surbrillance des portails d'entrée et de sortie"
 
 #: src/gui/userpalette.cpp:149
 msgid "Default collision Highlight"
-msgstr "Mise an avant des emplacements de collision : Défaut"
+msgstr "Surbrillance des zones de collision : Défaut"
 
 #: src/gui/userpalette.cpp:151
 msgid "Air collision Highlight"
-msgstr "Mise an avant des emplacements de collision : Air"
+msgstr "Surbrillance des zones de collision : Air"
 
 #: src/gui/userpalette.cpp:153
 msgid "Water collision Highlight"
-msgstr "Mise an avant des emplacements de collision : Eau"
+msgstr "Surbrillance des zones de collision : Eau"
 
 #: src/gui/userpalette.cpp:155
 msgid "Walkable Highlight"
@@ -3296,7 +3289,7 @@ msgstr "Limites de votre position"
 
 #: src/gui/userpalette.cpp:167
 msgid "Road Point"
-msgstr "Point de route"
+msgstr "Étape"
 
 #: src/gui/whoisonline.cpp:70 src/gui/whoisonline.cpp:457
 msgid "Who Is Online - Updating"
@@ -3348,7 +3341,8 @@ msgstr "Commande : /users"
 
 #: src/gui/widgets/channeltab.cpp:65
 msgid "This command shows the users in this channel."
-msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
+msgstr ""
+"Cette commande affiche la liste d'utilisateurs présents dans ce salon."
 
 #: src/gui/widgets/channeltab.cpp:69
 msgid "Command: /topic <message>"
@@ -3421,7 +3415,7 @@ msgstr "Annonce globale de %s :"
 #: src/gui/widgets/chattab.cpp:182
 #, c-format
 msgid "%s whispers: %s"
-msgstr "Message privé de %s : %s"
+msgstr "Message de %s : %s"
 
 #: src/gui/widgets/whispertab.cpp:105
 msgid "/ignore > Ignore the other player"
@@ -3429,7 +3423,7 @@ msgstr "/ignore > Ignore l'autre joueur"
 
 #: src/gui/widgets/whispertab.cpp:106
 msgid "/unignore > Stop ignoring the other player"
-msgstr "/unignore > Cesse d'ignorer l'autre joueur"
+msgstr "/unignore > Cesser d'ignorer l'autre joueur"
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/close > Close the whisper tab"
@@ -3458,16 +3452,18 @@ msgid "Command: /unignore <player>"
 msgstr "Commande : /unignore <joueur>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
 #: src/gui/windowmenu.cpp:62
 msgid "BC"
-msgstr "BC"
+msgstr "TdR"
 
 #: src/gui/windowmenu.cpp:62
 msgid "Bot checker"
-msgstr "Contrôle de robot"
+msgstr "Testeur de robot"
 
 #: src/gui/windowmenu.cpp:64
 msgid "ONL"
@@ -3482,12 +3478,12 @@ msgid "KS"
 msgstr "Sta"
 
 #: src/gui/windowmenu.cpp:68
-msgid "Smiles"
-msgstr "Emo"
+msgid "Smilies"
+msgstr "Émoticône"
 
 #: src/gui/windowmenu.cpp:70
 msgid "STA"
-msgstr "CAR"
+msgstr "Car"
 
 #: src/gui/windowmenu.cpp:70
 msgid "Status"
@@ -3495,27 +3491,27 @@ msgstr "Statut"
 
 #: src/gui/windowmenu.cpp:71
 msgid "EQU"
-msgstr "EQU"
+msgstr "Equ"
 
 #: src/gui/windowmenu.cpp:73
 msgid "INV"
-msgstr "INV"
+msgstr "Inv"
 
 #: src/gui/windowmenu.cpp:78
 msgid "SKI"
-msgstr "CMP"
+msgstr "Cmp"
 
 #: src/gui/windowmenu.cpp:85
 msgid "SPE"
-msgstr "SPE"
+msgstr "Spe"
 
 #: src/gui/windowmenu.cpp:90
 msgid "SOC"
-msgstr "SOC"
+msgstr "Soc"
 
 #: src/gui/windowmenu.cpp:91
 msgid "SH"
-msgstr "RAC"
+msgstr "Rac"
 
 #: src/gui/windowmenu.cpp:91
 msgid "Shortcuts"
@@ -3523,15 +3519,15 @@ msgstr "Raccourcis"
 
 #: src/gui/windowmenu.cpp:93
 msgid "SP"
-msgstr "SOR"
+msgstr "Sor"
 
 #: src/gui/windowmenu.cpp:94
 msgid "DR"
-msgstr "JT"
+msgstr "Jet"
 
 #: src/gui/windowmenu.cpp:95
 msgid "SET"
-msgstr "CFG"
+msgstr "Cfg"
 
 #: src/gui/worldselectdialog.cpp:75
 msgid "Select World"
@@ -3539,7 +3535,7 @@ msgstr "Sélection du monde"
 
 #: src/gui/worldselectdialog.cpp:80
 msgid "Change Login"
-msgstr "Changer de Login"
+msgstr "Changer de Compte"
 
 #: src/gui/worldselectdialog.cpp:81
 msgid "Choose World"
@@ -3551,7 +3547,7 @@ msgstr "Entrepôt"
 
 #: src/inventory.cpp:242
 msgid "Cart"
-msgstr "Sacoche"
+msgstr "Sac"
 
 #: src/keyboardconfig.cpp:41
 msgid "Move Up"
@@ -3571,11 +3567,11 @@ msgstr "Aller à droite"
 
 #: src/keyboardconfig.cpp:47
 msgid "Target & Attack"
-msgstr "Cibler et Attaquer"
+msgstr "Viser et Attaquer"
 
 #: src/keyboardconfig.cpp:49
 msgid "Move to Target"
-msgstr "Se déplacer vers la cible"
+msgstr "Aller à la cible"
 
 #: src/keyboardconfig.cpp:51
 msgid "Change Move to Target type"
@@ -3583,11 +3579,11 @@ msgstr "Changer le type de déplacement vers les cibles"
 
 #: src/keyboardconfig.cpp:53
 msgid "Move to Home location"
-msgstr "Se déplacer jusqu'à la l'emplacement de référence"
+msgstr "Aller à l'emplacement de base"
 
 #: src/keyboardconfig.cpp:55
 msgid "Set home location"
-msgstr "indiquer l'emplacement de référence"
+msgstr "Définir l'emplacement de base"
 
 #: src/keyboardconfig.cpp:57
 msgid "Move to navigation point"
@@ -3603,7 +3599,7 @@ msgstr "Arrêter d'attaquer"
 
 #: src/keyboardconfig.cpp:62
 msgid "Target Closest"
-msgstr "Cibler le monstre le plus proche"
+msgstr "Viser le monstre le plus proche"
 
 #: src/keyboardconfig.cpp:64
 msgid "Target NPC"
@@ -3611,7 +3607,7 @@ msgstr "Cibler le PNJ"
 
 #: src/keyboardconfig.cpp:65
 msgid "Target Player"
-msgstr "Cibler le Joueur"
+msgstr "Viser le Joueur"
 
 #: src/keyboardconfig.cpp:67
 msgid "Pickup"
@@ -3627,7 +3623,7 @@ msgstr "Cacher les fenêtres"
 
 #: src/keyboardconfig.cpp:72
 msgid "Sit"
-msgstr "S'assoir"
+msgstr "S'asseoir"
 
 #: src/keyboardconfig.cpp:73
 msgid "Screenshot"
@@ -3635,7 +3631,7 @@ msgstr "Capture d'écran"
 
 #: src/keyboardconfig.cpp:74
 msgid "Enable/Disable Trading"
-msgstr "Activer / Désactiver les échanges"
+msgstr "Activer/Désactiver les échanges"
 
 #: src/keyboardconfig.cpp:76
 msgid "Change Map View Mode"
@@ -3682,7 +3678,7 @@ msgstr "Fenêtre de compétences"
 
 #: src/keyboardconfig.cpp:129
 msgid "Minimap Window"
-msgstr "Fenêtre de Mini carte"
+msgstr "Fenêtre de Mini-carte"
 
 #: src/keyboardconfig.cpp:131
 msgid "Chat Window"
@@ -3706,7 +3702,7 @@ msgstr "Groupes et Guildes"
 
 #: src/keyboardconfig.cpp:140
 msgid "Emote Shortcut Window"
-msgstr "Fenêtre de raccourcis d'emote"
+msgstr "Fenêtre de raccourcis d’émoticônes"
 
 #: src/keyboardconfig.cpp:142
 msgid "Outfits Window"
@@ -3730,7 +3726,7 @@ msgstr "Fenêtre de commandes"
 
 #: src/keyboardconfig.cpp:151
 msgid "Bot Checker Window"
-msgstr "Fenêtre de contrôle de robot"
+msgstr "Fenêtre du testeur de robot"
 
 #: src/keyboardconfig.cpp:154
 msgid "Who Is Online Window"
@@ -3738,11 +3734,11 @@ msgstr "Fenêtre - Qui est en ligne ?"
 
 #: src/keyboardconfig.cpp:156
 msgid "Previous Social Tab"
-msgstr "Boite de dialogue précédente "
+msgstr "Onglet de dialogue précédent"
 
 #: src/keyboardconfig.cpp:157
 msgid "Next Social Tab"
-msgstr "Boite de dialogue suivante"
+msgstr "Onglet de dialogue suivant"
 
 #: src/keyboardconfig.cpp:159 src/keyboardconfig.cpp:161
 #: src/keyboardconfig.cpp:163 src/keyboardconfig.cpp:165
@@ -3769,7 +3765,7 @@ msgstr "Boite de dialogue suivante"
 #: src/keyboardconfig.cpp:341
 #, c-format
 msgid "Emote Shortcut %d"
-msgstr "Raccourci d'emote %d"
+msgstr "Raccourci d'émoticône %d"
 
 #: src/keyboardconfig.cpp:252
 msgid "Wear Outfit"
@@ -3797,23 +3793,23 @@ msgstr "Défiler la conversation (bas)"
 
 #: src/keyboardconfig.cpp:264
 msgid "Previous Chat Tab"
-msgstr "Onglet de la conversation précédente"
+msgstr "Onglet de conversation précédent"
 
 #: src/keyboardconfig.cpp:266
 msgid "Next Chat Tab"
-msgstr "Onglet de la conversation suivante"
+msgstr "Onglet de conversation suivant"
 
 #: src/keyboardconfig.cpp:268
 msgid "Previous chat tab line"
-msgstr "Boite de dialogue : ligne précédente "
+msgstr "Dialogue : ligne précédente "
 
 #: src/keyboardconfig.cpp:270
 msgid "Next chat tab line"
-msgstr "Boite de dialogue : ligne suivante"
+msgstr "Dialogue : ligne suivante"
 
 #: src/keyboardconfig.cpp:272
 msgid "Chat Auto Complete"
-msgstr "Autocomplétion du chat"
+msgstr "Auto complétion du chat"
 
 #: src/keyboardconfig.cpp:274
 msgid "Deactivate Chat Input"
@@ -3857,7 +3853,7 @@ msgstr "Changer le mode de mouvement de dingue"
 
 #: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items from 0 slot"
-msgstr "Jeter rapidement N objets depuis 0 emplacement"
+msgstr "Jeter rapidement N objets depuis l'emplacement 0"
 
 #: src/keyboardconfig.cpp:294
 msgid "Quick Drop N Items"
@@ -3869,7 +3865,7 @@ msgstr "Changer de compteur de jet rapide d'objets"
 
 #: src/keyboardconfig.cpp:298
 msgid "Quick heal target or self"
-msgstr "Soigner rapidement la cible ou soi-même"
+msgstr "Soins rapides de la cible ou de soi"
 
 #: src/keyboardconfig.cpp:300
 msgid "Use #itenplz spell"
@@ -3881,27 +3877,27 @@ msgstr "Utiliser l'attaque magique"
 
 #: src/keyboardconfig.cpp:304
 msgid "Switch magic attack"
-msgstr "Changer l'attaque magique"
+msgstr "Changer d'attaque magique"
 
 #: src/keyboardconfig.cpp:306
 msgid "Change move type"
-msgstr "Changer le type de mouvement"
+msgstr "Changer de type de mouvement"
 
 #: src/keyboardconfig.cpp:308
 msgid "Change Attack Weapon Type"
-msgstr "Changer le type d'attaque armée"
+msgstr "Changer de type d'arme d'attaque"
 
 #: src/keyboardconfig.cpp:310
 msgid "Change Attack Type"
-msgstr "Changer le type d'attaque"
+msgstr "Changer de type d'attaque"
 
 #: src/keyboardconfig.cpp:312
 msgid "Change Follow mode"
-msgstr "Changer le type de suivi"
+msgstr "Changer de type de suivi"
 
 #: src/keyboardconfig.cpp:314
 msgid "Change Imitation mode"
-msgstr "Changer le type d'imitation"
+msgstr "Changer de type d'imitation"
 
 #: src/keyboardconfig.cpp:317
 msgid "Disable / Enable Game modifier keys"
@@ -3921,7 +3917,7 @@ msgstr "Emuler le clic droit à partir du clavier"
 
 #: src/keyboardconfig.cpp:324
 msgid "Toggle camera mode"
-msgstr "Changer le mode de caméra"
+msgstr "Changer le mode caméra"
 
 #: src/keyboardconfig.cpp:397
 #, c-format
@@ -3929,8 +3925,8 @@ msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
-"Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une "
-"des touches ou attendez vous à un possible comportement étrange du jeu."
+"Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des "
+"touches ou attendez vous à un possible comportement étrange du jeu."
 
 #: src/localplayer.cpp:344
 msgid "You were killed by "
@@ -3954,7 +3950,7 @@ msgstr "L'inventaire est plein"
 
 #: src/localplayer.cpp:1387
 msgid "Stack is too big."
-msgstr "Le regroupement est trop plein"
+msgstr "La pile est trop grande"
 
 #: src/localplayer.cpp:1390
 msgid "Item belongs to someone else."
@@ -4019,7 +4015,7 @@ msgstr "Options :"
 
 #: src/main.cpp:51
 msgid "  -l --log-file       : Log file to use"
-msgstr "  -l --log-file       : Enregistre le fichier a utiliser"
+msgstr "  -l --log-file       : fichier journal à utiliser"
 
 #: src/main.cpp:52
 msgid "  -L --chat-log-dir   : Chat log dir to use"
@@ -4086,7 +4082,8 @@ msgstr ""
 
 #: src/main.cpp:69
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
+msgstr ""
+"      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
 #: src/main.cpp:70
 msgid "     --safemode       : Start game in safe mode"
@@ -4102,11 +4099,11 @@ msgstr "Rien à vendre."
 
 #: src/net/ea/buysellhandler.cpp:169
 msgid "Thanks for buying."
-msgstr "Merci pour votre achat."
+msgstr "Merci de votre achat."
 
 #: src/net/ea/buysellhandler.cpp:177
 msgid "Unable to buy."
-msgstr "Impossible d'acheter."
+msgstr "Incapable d'acheter."
 
 #: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:248
 msgid "Strength"
@@ -4293,7 +4290,7 @@ msgstr "Informations"
 
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
-msgstr "Personnage effacé."
+msgstr "Joueur effacé."
 
 #: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
@@ -4316,29 +4313,29 @@ msgstr "Sujet : %s"
 
 #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
-msgstr "Joueurs dans ce canal :"
+msgstr "Joueurs dans ce salon:"
 
 #: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr "Erreur lors de la tentative d'entrée dans le canal."
+msgstr "Erreur lors de la tentative d'entrée dans le salon."
 
 #: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
-msgstr "Liste des canaux."
+msgstr "Liste des salons."
 
 #: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
-msgstr "Fin de la liste du canal."
+msgstr "Fin de la liste du salon."
 
 #: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
-msgstr "%s a rejoint le canal."
+msgstr "%s a rejoint le salon."
 
 #: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
-msgstr "%s a quitté le canal"
+msgstr "%s a quitté le salon"
 
 #: src/net/manaserv/chathandler.cpp:320
 #, c-format
@@ -4368,7 +4365,7 @@ msgstr "Invitation envoyée."
 
 #: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
-msgstr "La promotion de ce membre a réussie."
+msgstr "Ce membre a été promu avec succès."
 
 #: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
@@ -4503,15 +4500,15 @@ msgstr "Sortie de la personne effectuée avec succès !"
 
 #: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
-msgstr "Merci pour votre vente."
+msgstr "Merci de votre vente."
 
 #: src/net/tmwa/buysellhandler.cpp:133
 msgid "Unable to sell."
-msgstr "Impossible de vendre."
+msgstr "Incapable de vendre."
 
 #: src/net/tmwa/buysellhandler.cpp:136
 msgid "Unable to sell while trading."
-msgstr "Rendre possible de vendre pendant un échange en cours"
+msgstr "Impossible de vendre pendant un échange en cours"
 
 #: src/net/tmwa/buysellhandler.cpp:139
 msgid "Unable to sell unsellable item."
@@ -4669,7 +4666,7 @@ msgstr "Ce compte est déjà connecté."
 
 #: src/net/tmwa/generalhandler.cpp:149
 msgid "Speed hack detected."
-msgstr "Speed hack detecté."
+msgstr "Speed hack détecté."
 
 #: src/net/tmwa/generalhandler.cpp:152
 msgid "Duplicated login."
@@ -4737,7 +4734,7 @@ msgstr "/leave > Quitter la guilde courante"
 
 #: src/net/tmwa/gui/guildtab.cpp:78
 msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Ejecter quelqu'un du groupe dont vous faites partie"
+msgstr "/kick > Éjecter quelqu'un du groupe dont vous faites partie"
 
 #: src/net/tmwa/gui/guildtab.cpp:87 src/net/tmwa/gui/partytab.cpp:81
 msgid "Command: /invite <nick>"
@@ -5004,7 +5001,7 @@ msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:178
 msgid "Client too old."
-msgstr "Interface trop ancienne."
+msgstr "Client trop ancien."
 
 #: src/net/tmwa/loginhandler.cpp:181
 #, c-format
@@ -5025,7 +5022,7 @@ msgstr "Ce nom d'utilisateur est déjà utilisé."
 
 #: src/net/tmwa/loginhandler.cpp:197
 msgid "Username permanently erased."
-msgstr "Le nom de l'utilisateur a été eliminé de façon permanente."
+msgstr "Le nom de l'utilisateur a été éliminé de façon permanente."
 
 #: src/net/tmwa/network.cpp:149
 msgid "Empty address given to Network::connect()!"
@@ -5049,7 +5046,7 @@ msgstr "Création du groupe réussie."
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, c-format
-msgid "%s has join your party."
+msgid "%s has joined your party."
 msgstr "%s a rejoint votre groupe."
 
 #: src/net/tmwa/partyhandler.cpp:177
@@ -5069,8 +5066,8 @@ msgstr "%s est maintenant membre de votre groupe."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
-msgstr "%s ne peut rejoindre le groupe car il est au complet."
+msgid "%s can't join your party because party is full."
+msgstr "%s ne peut rejoindre votre groupe. Celui-ci est complet."
 
 #: src/net/tmwa/partyhandler.cpp:197
 #, c-format
@@ -5165,16 +5162,17 @@ msgstr "Message"
 
 #: src/net/tmwa/playerhandler.cpp:341
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
-"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
-"en mesure de regagner vos points de vie."
+"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus"
+" en mesure de regagner vos points de vie."
 
 #: src/net/tmwa/playerhandler.cpp:351
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
-"Vous portez moins de la moitié du poids de votre inventaire.Vous pouvez vous "
-"régénérez de nouveau."
+"Vous portez moins que la moitié de votre poids. Vous pouvez récupérer votre "
+"santé."
 
 #: src/net/tmwa/playerhandler.cpp:456
 #, c-format
@@ -5192,19 +5190,19 @@ msgstr "Ne peut pas augmenter la capacité !"
 
 #: src/net/tmwa/playerhandler.cpp:627
 msgid "Equip arrows first."
-msgstr "Équiper en premier les flèches"
+msgstr "Équiper d'abord les flèches!"
 
 #: src/net/tmwa/specialhandler.cpp:156
 msgid "Trade failed!"
-msgstr "Échange non réalisé !"
+msgstr "Échec de la transaction !"
 
 #: src/net/tmwa/specialhandler.cpp:159
 msgid "Emote failed!"
-msgstr "Emote non réalisé !"
+msgstr "Émoticône non réalisée !"
 
 #: src/net/tmwa/specialhandler.cpp:162
 msgid "Sit failed!"
-msgstr "Vous n'avez pas pu vous assoir !"
+msgstr "Vous n'avez pas pu vous asseoir !"
 
 #: src/net/tmwa/specialhandler.cpp:165
 msgid "Chat creating failed!"
@@ -5313,8 +5311,8 @@ msgstr ""
 "de place libre."
 
 #: src/net/tmwa/tradehandler.cpp:258
-msgid "Failed adding item. You cant trade this item."
-msgstr "L'item ne peut être ajouté. Vous ne pouvez marchandez cet item."
+msgid "Failed adding item. You can't trade this item."
+msgstr "Impossible d'ajouter l'objet. Celui-ci ne peut pas être échangeable."
 
 #: src/net/tmwa/tradehandler.cpp:262
 msgid "Failed adding item for unknown reason."
@@ -5364,3 +5362,5 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Objet inconnu"
+
+
diff --git a/po/hr.po b/po/hr.po
index 5934b23ff..c074d4383 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\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"
@@ -470,10 +470,10 @@ msgstr "Prodaj"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -789,146 +789,143 @@ msgstr "Pomakni Ulijevo"
 msgid "Net"
 msgstr "Slijedeći"
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 #, fuzzy
 msgid "Music:"
 msgstr "Tema: %s"
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 #, fuzzy
 msgid "Map:"
 msgstr "Ime: %s"
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 #, fuzzy
 msgid "Minimap:"
 msgstr "Prozor Minikarte"
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+#, fuzzy
+msgid "Cursor:"
+msgstr "Vlastiti kursor"
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 #, fuzzy
 msgid "Player Position:"
 msgstr "Igrač pogađa Čudovište"
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, fuzzy, c-format
-msgid "Particle count: %d"
+#: src/gui/debugwindow.cpp:140
+#, fuzzy
+msgid "Particle count:"
 msgstr "Efekti Čestica"
 
-#: src/gui/debugwindow.cpp:141
-#, fuzzy, c-format
-msgid "Map actors count: %d"
-msgstr "Podaci lika su u redu"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-#, fuzzy
-msgid "Cursor:"
-msgstr "Vlastiti kursor"
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
-msgstr ""
+#: src/gui/debugwindow.cpp:219
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Efekti Čestica"
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 #, fuzzy
 msgid "Target:"
 msgstr "Pomakni Ulijevo"
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 #, fuzzy
 msgid "Target Id:"
 msgstr "Ciljaj Igrača"
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 #, fuzzy
 msgid "Target Level:"
 msgstr "Ciljaj Igrača"
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 #, fuzzy
 msgid "Target Party:"
 msgstr "Ciljaj Igrača"
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 #, fuzzy
 msgid "Target Guild:"
 msgstr "Ciljaj Igrača"
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 #, fuzzy
 msgid "Attack delay:"
 msgstr "Napad %+d"
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 #, fuzzy
 msgid "Minimal hit:"
 msgstr "Prozor Minikarte"
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 #, fuzzy
 msgid "Critical hit:"
 msgstr "Kritični Udarac"
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -945,8 +942,8 @@ msgstr "Oprema"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Skini opremu"
 
@@ -993,27 +990,27 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Opremi"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Upotrijebi"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 #, fuzzy
 msgid "Drop..."
 msgstr "Ispusti"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Razdvoji"
 
@@ -1027,17 +1024,17 @@ msgid "Weight:"
 msgstr "Težina:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Pohrani"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Ispusti"
@@ -1317,8 +1314,7 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Zatvori"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid "> Next"
 msgstr "Slijedeći"
@@ -1465,7 +1461,7 @@ msgid "Show Items"
 msgstr "Prikaži ime"
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
 msgstr ""
 
@@ -1502,8 +1498,8 @@ msgstr "@@chat|Dudaj u chat@@"
 msgid "Pick up"
 msgstr "Pokupi"
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Dudaj u chat@@"
@@ -1517,8 +1513,8 @@ msgstr ""
 msgid "Rename"
 msgstr "Zapamti korisničko ime"
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 #, fuzzy
 msgid "Remove"
 msgstr "Zapamti korisničko ime"
@@ -1578,96 +1574,98 @@ msgstr "Veliko"
 msgid "Change guild position"
 msgstr "Izmijeni"
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 #, fuzzy
 msgid "Store 10"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 #, fuzzy
 msgid "Store half"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 #, fuzzy
 msgid "Store all"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Preuzmi"
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Preuzmi"
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Preuzmi"
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 #, fuzzy
 msgid "(default)"
 msgstr "Zadano"
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 #, fuzzy
 msgid "Move up"
 msgstr "Pomakni Gore"
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 #, fuzzy
 msgid "Move down"
 msgstr "Pomakni Dolje"
@@ -3696,7 +3694,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:68
 #, fuzzy
-msgid "Smiles"
+msgid "Smilies"
 msgstr "Smajlić"
 
 #: src/gui/windowmenu.cpp:70
@@ -5350,7 +5348,7 @@ msgstr "Partija je uspješno kreirana."
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, fuzzy, c-format
-msgid "%s has join your party."
+msgid "%s has joined your party."
 msgstr "%s je napustio/la vašu partiju."
 
 #: src/net/tmwa/partyhandler.cpp:177
@@ -5370,7 +5368,7 @@ msgstr "%s je sada član vaše partije."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
@@ -5469,7 +5467,7 @@ msgstr ""
 
 #: src/net/tmwa/playerhandler.cpp:351
 #, fuzzy
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Nosite više od pola svoje težine. Niste u mogućnosti kako bi povratili "
 "zdravlje."
@@ -5609,7 +5607,7 @@ msgstr ""
 
 #: src/net/tmwa/tradehandler.cpp:258
 #, fuzzy
-msgid "Failed adding item. You cant trade this item."
+msgid "Failed adding item. You can't trade this item."
 msgstr "Neuspješno dodavanje predmeta. Trgovinski partner je preopterećen."
 
 #: src/net/tmwa/tradehandler.cpp:262
@@ -5662,6 +5660,14 @@ msgid "Unknown item"
 msgstr "Nepoznati predmet"
 
 #, fuzzy
+#~ msgid "Map actors count: %d"
+#~ msgstr "Podaci lika su u redu"
+
+#, fuzzy
+#~ msgid "Smiles"
+#~ msgstr "Smajlić"
+
+#, fuzzy
 #~ msgid "@@trade|Trade@@"
 #~ msgstr "@@trade|Razmijeni se s %s@@"
 
diff --git a/po/hu.po b/po/hu.po
index 7d1787fbe..846f6ff35 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\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"
@@ -465,10 +465,10 @@ msgstr "Eladás"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -785,146 +785,143 @@ msgstr "Mozgás balra"
 msgid "Net"
 msgstr "Következő"
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 #, fuzzy
 msgid "Music:"
 msgstr "Téma: %s"
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 #, fuzzy
 msgid "Map:"
 msgstr "Név: %s"
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 #, fuzzy
 msgid "Minimap:"
 msgstr "Minitérkép Ablak"
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+#, fuzzy
+msgid "Cursor:"
+msgstr "Egyéni kurzor"
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 #, fuzzy
 msgid "Player Position:"
 msgstr "Sebzéskor"
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, fuzzy, c-format
-msgid "Particle count: %d"
+#: src/gui/debugwindow.cpp:140
+#, fuzzy
+msgid "Particle count:"
 msgstr "Effektek"
 
-#: src/gui/debugwindow.cpp:141
-#, fuzzy, c-format
-msgid "Map actors count: %d"
-msgstr "Karakter statok rendben"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-#, fuzzy
-msgid "Cursor:"
-msgstr "Egyéni kurzor"
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
-msgstr ""
+#: src/gui/debugwindow.cpp:219
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Effektek"
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 #, fuzzy
 msgid "Target:"
 msgstr "Mozgás balra"
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 #, fuzzy
 msgid "Target Id:"
 msgstr "Játékost Kijelöl"
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 #, fuzzy
 msgid "Target Level:"
 msgstr "Játékost Kijelöl"
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 #, fuzzy
 msgid "Target Party:"
 msgstr "Játékost Kijelöl"
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 #, fuzzy
 msgid "Target Guild:"
 msgstr "Játékost Kijelöl"
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 #, fuzzy
 msgid "Attack delay:"
 msgstr "Támadás %+d"
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 #, fuzzy
 msgid "Minimal hit:"
 msgstr "Minitérkép Ablak"
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 #, fuzzy
 msgid "Critical hit:"
 msgstr "Kritikális ütéskor"
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -941,8 +938,8 @@ msgstr "Felszerelés"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Nem használ"
 
@@ -989,27 +986,27 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Használ"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Bevet"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 #, fuzzy
 msgid "Drop..."
 msgstr "Eldob"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Felosztás"
 
@@ -1023,17 +1020,17 @@ msgid "Weight:"
 msgstr "Súly:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Raktároz"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Eldob"
@@ -1313,8 +1310,7 @@ msgstr "Gépjátékos"
 msgid "Clear"
 msgstr "Szálfegyver"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid "> Next"
 msgstr "Következő"
@@ -1461,7 +1457,7 @@ msgid "Show Items"
 msgstr "A név mutatása"
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
 msgstr ""
 
@@ -1498,8 +1494,8 @@ msgstr "@@chat|Hozzáadás a chat-hez@@"
 msgid "Pick up"
 msgstr "Felvesz"
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
@@ -1513,8 +1509,8 @@ msgstr ""
 msgid "Rename"
 msgstr "Felhasználónév megjegyzése"
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 #, fuzzy
 msgid "Remove"
 msgstr "Felhasználónév megjegyzése"
@@ -1574,96 +1570,98 @@ msgstr "Nagy"
 msgid "Change guild position"
 msgstr "Változtatás"
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 #, fuzzy
 msgid "Store 10"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 #, fuzzy
 msgid "Store half"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 #, fuzzy
 msgid "Store all"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Magához vesz"
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Magához vesz"
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Magához vesz"
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 #, fuzzy
 msgid "(default)"
 msgstr "Alapértelmezett"
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 #, fuzzy
 msgid "Move up"
 msgstr "Mozgás felfelé"
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 #, fuzzy
 msgid "Move down"
 msgstr "Mozgás lefelé"
@@ -3698,7 +3696,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:68
 #, fuzzy
-msgid "Smiles"
+msgid "Smilies"
 msgstr "Hangulatjel"
 
 #: src/gui/windowmenu.cpp:70
@@ -5368,7 +5366,7 @@ msgstr "Csapat létrehozása sikeres."
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, fuzzy, c-format
-msgid "%s has join your party."
+msgid "%s has joined your party."
 msgstr "%s elhagyta a csapatot."
 
 #: src/net/tmwa/partyhandler.cpp:177
@@ -5388,7 +5386,7 @@ msgstr "%s mostantól a csapatod tagja."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
@@ -5485,7 +5483,7 @@ msgstr "Több tárgy van nálad mint a súlyod fele. Nem töltődik az életed."
 
 #: src/net/tmwa/playerhandler.cpp:351
 #, fuzzy
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Több tárgy van nálad mint a súlyod fele. Nem töltődik az életed."
 
 #: src/net/tmwa/playerhandler.cpp:456
@@ -5623,7 +5621,7 @@ msgstr "Tárgy hozzáadása sikertelen. Az üzleti partnernek nincs elég helye.
 
 #: src/net/tmwa/tradehandler.cpp:258
 #, fuzzy
-msgid "Failed adding item. You cant trade this item."
+msgid "Failed adding item. You can't trade this item."
 msgstr ""
 "Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
 
@@ -5677,6 +5675,14 @@ msgid "Unknown item"
 msgstr "Ismeretlen tárgy"
 
 #, fuzzy
+#~ msgid "Map actors count: %d"
+#~ msgstr "Karakter statok rendben"
+
+#, fuzzy
+#~ msgid "Smiles"
+#~ msgstr "Hangulatjel"
+
+#, fuzzy
 #~ msgid "@@trade|Trade@@"
 #~ msgstr "@@trade|Üzlet Te és %s között@@"
 
diff --git a/po/it.po b/po/it.po
index 1e75cf70e..21c3fb051 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\n"
 "PO-Revision-Date: 2011-04-15 17:33+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Italian <>\n"
@@ -439,10 +439,10 @@ msgstr "Vendi"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -741,136 +741,133 @@ msgstr "Target:"
 msgid "Net"
 msgstr "Prossimo"
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 msgid "Music:"
 msgstr "Musica:"
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 msgid "Map:"
 msgstr "Mappa:"
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 msgid "Minimap:"
 msgstr "Mini mappa:"
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr "Cursore: (%d, %d)"
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+msgid "Cursor:"
+msgstr "Cursore:"
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 msgid "Player Position:"
 msgstr "Posizione giocatore:"
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, c-format
-msgid "Particle count: %d"
-msgstr ""
+#: src/gui/debugwindow.cpp:140
+#, fuzzy
+msgid "Particle count:"
+msgstr "Effetti particelle"
 
-#: src/gui/debugwindow.cpp:141
-#, c-format
-msgid "Map actors count: %d"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (OpenGL veloce)"
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (OpenGL vecchio)"
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-msgid "Cursor:"
-msgstr "Cursore:"
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
+#: src/gui/debugwindow.cpp:219
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 msgid "Target:"
 msgstr "Target:"
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 msgid "Target Id:"
 msgstr "Target ID:"
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 msgid "Target Level:"
 msgstr "Livello Target"
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 msgid "Target Party:"
 msgstr "Party del Target:"
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 msgid "Target Guild:"
 msgstr "Gilda del Target"
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 #, fuzzy
 msgid "Attack delay:"
 msgstr "Attacco %+d"
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 #, fuzzy
 msgid "Minimal hit:"
 msgstr "Mini mappa:"
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 #, fuzzy
 msgid "Critical hit:"
 msgstr "Colpo critico"
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr "Ping: %d ms"
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr "Ping: ? ms"
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "In: %d bytes/s"
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Out: %d bytes/s"
@@ -887,8 +884,8 @@ msgstr "Equipaggiamento"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Togli"
 
@@ -932,26 +929,26 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Equipaggia"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Usa"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 msgid "Drop..."
 msgstr "Lascia..."
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Dividi"
 
@@ -965,17 +962,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Magazzino"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Recupera"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Lascia"
@@ -1240,8 +1237,7 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Cancella"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 msgid "> Next"
 msgstr ""
 
@@ -1383,7 +1379,7 @@ msgid "Show Items"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
 msgstr ""
 
@@ -1419,8 +1415,8 @@ msgstr "@@name|Aggiungi il nome alla chat@@"
 msgid "Pick up"
 msgstr "Raccogli"
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 msgid "Add to chat"
 msgstr ""
 
@@ -1432,8 +1428,8 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 msgid "Remove"
 msgstr ""
 
@@ -1485,86 +1481,88 @@ msgstr ""
 msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 #, fuzzy
 msgid "(default)"
 msgstr "Predefinito"
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 #, fuzzy
 msgid "Move up"
 msgstr "Muoviti verso l'alto"
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 #, fuzzy
 msgid "Move down"
 msgstr "Muoviti verso il basso"
@@ -3487,7 +3485,7 @@ msgid "KS"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:68
-msgid "Smiles"
+msgid "Smilies"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:70
@@ -5028,9 +5026,9 @@ msgid "Party successfully created."
 msgstr "Party creato con successo."
 
 #: src/net/tmwa/partyhandler.cpp:141
-#, c-format
-msgid "%s has join your party."
-msgstr ""
+#, fuzzy, c-format
+msgid "%s has joined your party."
+msgstr "%s ha lasciato il tuo party."
 
 #: src/net/tmwa/partyhandler.cpp:177
 #, c-format
@@ -5049,7 +5047,7 @@ msgstr "%s è ora un membro del tuo party."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
@@ -5147,8 +5145,11 @@ msgstr ""
 "energie."
 
 #: src/net/tmwa/playerhandler.cpp:351
-msgid "You are carrying less than half your weight. You are can regain health."
+#, fuzzy
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
+"Stai trasportando più della metà del tuo peso. Non puoi recuperare le "
+"energie."
 
 #: src/net/tmwa/playerhandler.cpp:456
 #, c-format
@@ -5283,8 +5284,11 @@ msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
 #: src/net/tmwa/tradehandler.cpp:258
-msgid "Failed adding item. You cant trade this item."
+#, fuzzy
+msgid "Failed adding item. You can't trade this item."
 msgstr ""
+"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
+"finestra."
 
 #: src/net/tmwa/tradehandler.cpp:262
 msgid "Failed adding item for unknown reason."
@@ -5335,6 +5339,9 @@ msgstr "PM %+d"
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
+#~ msgid "Cursor: (%d, %d)"
+#~ msgstr "Cursore: (%d, %d)"
+
 #~ msgid "@@trade|Trade@@"
 #~ msgstr "@@trade|Scambio@@"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 9b90d8c36..0c2b3a942 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\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"
@@ -434,10 +434,10 @@ msgstr ""
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -731,133 +731,129 @@ msgstr ""
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, c-format
-msgid "Particle count: %d"
+#: src/gui/debugwindow.cpp:140
+msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:141
-#, c-format
-msgid "Map actors count: %d"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-msgid "Cursor:"
-msgstr ""
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
+#: src/gui/debugwindow.cpp:219
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 msgid "Target Level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 msgid "Target Party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 msgid "Target Guild:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -874,8 +870,8 @@ msgstr ""
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr ""
 
@@ -919,26 +915,26 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr ""
 
@@ -952,17 +948,17 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr ""
@@ -1227,8 +1223,7 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 msgid "> Next"
 msgstr ""
 
@@ -1360,7 +1355,7 @@ msgid "Show Items"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
 msgstr ""
 
@@ -1392,8 +1387,8 @@ msgstr ""
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 msgid "Add to chat"
 msgstr ""
 
@@ -1405,8 +1400,8 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 msgid "Remove"
 msgstr ""
 
@@ -1458,84 +1453,86 @@ msgstr ""
 msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 msgid "Move down"
 msgstr ""
 
@@ -3450,7 +3447,7 @@ msgid "KS"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:68
-msgid "Smiles"
+msgid "Smilies"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:70
@@ -4979,7 +4976,7 @@ msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, c-format
-msgid "%s has join your party."
+msgid "%s has joined your party."
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:177
@@ -4999,7 +4996,7 @@ msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
@@ -5095,7 +5092,7 @@ msgid ""
 msgstr ""
 
 #: src/net/tmwa/playerhandler.cpp:351
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #: src/net/tmwa/playerhandler.cpp:456
@@ -5231,7 +5228,7 @@ msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
 #: src/net/tmwa/tradehandler.cpp:258
-msgid "Failed adding item. You cant trade this item."
+msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
 #: src/net/tmwa/tradehandler.cpp:262
diff --git a/po/nl.po b/po/nl.po
index 3a11bb6de..f527c7f4e 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: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\n"
 "PO-Revision-Date: 2009-07-15 12:21+0000\n"
 "Last-Translator: Yentl <y.v.t@scarlet.be>\n"
 "Language-Team: Dutch\n"
@@ -464,10 +464,10 @@ msgstr "Verkopen"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -784,146 +784,143 @@ msgstr "Naar links"
 msgid "Net"
 msgstr "Volgende"
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 #, fuzzy
 msgid "Music:"
 msgstr "Onderwerp: %s"
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 #, fuzzy
 msgid "Map:"
 msgstr "Naam: %s"
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 #, fuzzy
 msgid "Minimap:"
 msgstr "Kaartje"
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+#, fuzzy
+msgid "Cursor:"
+msgstr "Aangepaste cursor"
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 #, fuzzy
 msgid "Player Position:"
 msgstr "Speler raakt Monster"
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, fuzzy, c-format
-msgid "Particle count: %d"
+#: src/gui/debugwindow.cpp:140
+#, fuzzy
+msgid "Particle count:"
 msgstr "Deeltjes effecten"
 
-#: src/gui/debugwindow.cpp:141
-#, fuzzy, c-format
-msgid "Map actors count: %d"
-msgstr "Attributen van personage OK"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-#, fuzzy
-msgid "Cursor:"
-msgstr "Aangepaste cursor"
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
-msgstr ""
+#: src/gui/debugwindow.cpp:219
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Deeltjes effecten"
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 #, fuzzy
 msgid "Target:"
 msgstr "Naar links"
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 #, fuzzy
 msgid "Target Id:"
 msgstr "Speler viseren"
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 #, fuzzy
 msgid "Target Level:"
 msgstr "Speler viseren"
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 #, fuzzy
 msgid "Target Party:"
 msgstr "Speler viseren"
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 #, fuzzy
 msgid "Target Guild:"
 msgstr "Speler viseren"
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 #, fuzzy
 msgid "Attack delay:"
 msgstr "Aanval %+d"
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 #, fuzzy
 msgid "Minimal hit:"
 msgstr "Kaartje"
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 #, fuzzy
 msgid "Critical hit:"
 msgstr "Kritieke aanval"
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -940,8 +937,8 @@ msgstr "Uitrusting"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -988,27 +985,27 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Gebruiken"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 #, fuzzy
 msgid "Drop..."
 msgstr "Neerleggen"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Splitsen"
 
@@ -1022,17 +1019,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Neerleggen"
@@ -1312,8 +1309,7 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Sluiten"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid "> Next"
 msgstr "Volgende"
@@ -1459,7 +1455,7 @@ msgid "Show Items"
 msgstr "Naam tonen"
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
 msgstr ""
 
@@ -1495,8 +1491,8 @@ msgstr ""
 msgid "Pick up"
 msgstr "Oprapen"
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 msgid "Add to chat"
 msgstr ""
 
@@ -1509,8 +1505,8 @@ msgstr ""
 msgid "Rename"
 msgstr "Onthoud Naam"
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 #, fuzzy
 msgid "Remove"
 msgstr "Onthoud Naam"
@@ -1570,96 +1566,98 @@ msgstr "Groot"
 msgid "Change guild position"
 msgstr "Veranderen"
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 #, fuzzy
 msgid "Add to trade"
 msgstr "Handel goedkeuren"
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 #, fuzzy
 msgid "Store 10"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 #, fuzzy
 msgid "Store half"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 #, fuzzy
 msgid "Store all"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Afhalen"
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Afhalen"
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Afhalen"
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 #, fuzzy
 msgid "(default)"
 msgstr "Standaard"
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 #, fuzzy
 msgid "Move up"
 msgstr "Omhoog"
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 #, fuzzy
 msgid "Move down"
 msgstr "Omlaag"
@@ -3697,7 +3695,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:68
 #, fuzzy
-msgid "Smiles"
+msgid "Smilies"
 msgstr "Smilie"
 
 #: src/gui/windowmenu.cpp:70
@@ -5372,7 +5370,7 @@ msgstr "Groep succesvol aangemaakt."
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, fuzzy, c-format
-msgid "%s has join your party."
+msgid "%s has joined your party."
 msgstr "%s heeft jouw groep verlaten."
 
 #: src/net/tmwa/partyhandler.cpp:177
@@ -5392,7 +5390,7 @@ msgstr "%s is nu een lid van jouw groep."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
@@ -5491,7 +5489,7 @@ msgstr ""
 
 #: src/net/tmwa/playerhandler.cpp:351
 #, fuzzy
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
 "herstellen."
@@ -5631,7 +5629,7 @@ msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
 
 #: src/net/tmwa/tradehandler.cpp:258
 #, fuzzy
-msgid "Failed adding item. You cant trade this item."
+msgid "Failed adding item. You can't trade this item."
 msgstr ""
 "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
 "het venster."
@@ -5686,6 +5684,14 @@ msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
 #, fuzzy
+#~ msgid "Map actors count: %d"
+#~ msgstr "Attributen van personage OK"
+
+#, fuzzy
+#~ msgid "Smiles"
+#~ msgstr "Smilie"
+
+#, fuzzy
 #~ msgid "@@trade|Trade@@"
 #~ msgstr "@@trade|Handelen met %s@@"
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 4fad3834c..38d7f9eb2 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: manaplus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\n"
 "PO-Revision-Date: 2011-03-29 18:51+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium/Flemish) <>\n"
@@ -439,10 +439,10 @@ msgstr "Verkopen"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -741,136 +741,133 @@ msgstr "NPC viseren"
 msgid "Net"
 msgstr "Volgende"
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, c-format
-msgid "Particle count: %d"
-msgstr ""
+#: src/gui/debugwindow.cpp:140
+#, fuzzy
+msgid "Particle count:"
+msgstr "Deeltjes effecten"
 
-#: src/gui/debugwindow.cpp:141
-#, c-format
-msgid "Map actors count: %d"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-msgid "Cursor:"
-msgstr ""
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
+#: src/gui/debugwindow.cpp:219
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 msgid "Target Level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 msgid "Target Party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 msgid "Target Guild:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 #, fuzzy
 msgid "Attack delay:"
 msgstr "Aanval %+d"
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 #, fuzzy
 msgid "Minimal hit:"
 msgstr "Minimapvenster"
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 #, fuzzy
 msgid "Critical hit:"
 msgstr "Kritieke aanval"
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -887,8 +884,8 @@ msgstr "Uitrusting"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -932,26 +929,26 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Gebruiken"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Splitsen"
 
@@ -965,17 +962,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Neerleggen"
@@ -1240,8 +1237,7 @@ msgstr "NPC"
 msgid "Clear"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 msgid "> Next"
 msgstr ""
 
@@ -1381,7 +1377,7 @@ msgid "Show Items"
 msgstr "Toon niveau"
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
 msgstr ""
 
@@ -1414,8 +1410,8 @@ msgstr ""
 msgid "Pick up"
 msgstr "Oprapen"
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 msgid "Add to chat"
 msgstr ""
 
@@ -1428,8 +1424,8 @@ msgstr ""
 msgid "Rename"
 msgstr "naamloos"
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 msgid "Remove"
 msgstr ""
 
@@ -1481,86 +1477,88 @@ msgstr ""
 msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 #, fuzzy
 msgid "(default)"
 msgstr "standaard"
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 #, fuzzy
 msgid "Move up"
 msgstr "Omhoog"
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 #, fuzzy
 msgid "Move down"
 msgstr "Omlaag"
@@ -3491,8 +3489,9 @@ msgid "KS"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:68
-msgid "Smiles"
-msgstr ""
+#, fuzzy
+msgid "Smilies"
+msgstr "Smilie"
 
 #: src/gui/windowmenu.cpp:70
 msgid "STA"
@@ -5038,9 +5037,9 @@ msgid "Party successfully created."
 msgstr "Groep succesvol aangemaakt."
 
 #: src/net/tmwa/partyhandler.cpp:141
-#, c-format
-msgid "%s has join your party."
-msgstr ""
+#, fuzzy, c-format
+msgid "%s has joined your party."
+msgstr "%s heeft jouw groep verlaten."
 
 #: src/net/tmwa/partyhandler.cpp:177
 #, c-format
@@ -5059,7 +5058,7 @@ msgstr "%s is nu een lid van jouw groep."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
@@ -5157,8 +5156,11 @@ msgstr ""
 "herstellen."
 
 #: src/net/tmwa/playerhandler.cpp:351
-msgid "You are carrying less than half your weight. You are can regain health."
+#, fuzzy
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
+"Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
+"herstellen."
 
 #: src/net/tmwa/playerhandler.cpp:456
 #, c-format
@@ -5293,8 +5295,11 @@ msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
 
 #: src/net/tmwa/tradehandler.cpp:258
-msgid "Failed adding item. You cant trade this item."
+#, fuzzy
+msgid "Failed adding item. You can't trade this item."
 msgstr ""
+"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
+"het venster."
 
 #: src/net/tmwa/tradehandler.cpp:262
 msgid "Failed adding item for unknown reason."
diff --git a/po/pl.po b/po/pl.po
index 6a0dbea4a..d081fc9c3 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: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\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"
@@ -472,10 +472,10 @@ msgstr "Sprzedaj"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -792,146 +792,143 @@ msgstr "Przesuń w lewo"
 msgid "Net"
 msgstr "Następna"
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 #, fuzzy
 msgid "Music:"
 msgstr "Temat: %s"
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 #, fuzzy
 msgid "Map:"
 msgstr "Imię: %s"
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 #, fuzzy
 msgid "Minimap:"
 msgstr "MiniMapa"
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+#, fuzzy
+msgid "Cursor:"
+msgstr "Własny kursor"
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 #, fuzzy
 msgid "Player Position:"
 msgstr "Gracz uderza Potwora"
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, fuzzy, c-format
-msgid "Particle count: %d"
+#: src/gui/debugwindow.cpp:140
+#, fuzzy
+msgid "Particle count:"
 msgstr "Efekty Cząsteczkowe"
 
-#: src/gui/debugwindow.cpp:141
-#, fuzzy, c-format
-msgid "Map actors count: %d"
-msgstr "Statystyki postaci w porządku."
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-#, fuzzy
-msgid "Cursor:"
-msgstr "Własny kursor"
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
-msgstr ""
+#: src/gui/debugwindow.cpp:219
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Efekty Cząsteczkowe"
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 #, fuzzy
 msgid "Target:"
 msgstr "Przesuń w lewo"
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 #, fuzzy
 msgid "Target Id:"
 msgstr "Namierz Gracza"
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 #, fuzzy
 msgid "Target Level:"
 msgstr "Namierz Gracza"
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 #, fuzzy
 msgid "Target Party:"
 msgstr "Namierz Gracza"
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 #, fuzzy
 msgid "Target Guild:"
 msgstr "Namierz Gracza"
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 #, fuzzy
 msgid "Attack delay:"
 msgstr "Atak %+d"
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 #, fuzzy
 msgid "Minimal hit:"
 msgstr "MiniMapa"
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 #, fuzzy
 msgid "Critical hit:"
 msgstr "Uderzenie Krytyczne"
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -948,8 +945,8 @@ msgstr "Ekwipunek"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Zdejmij"
 
@@ -995,27 +992,27 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Załóż"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Użyj"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 #, fuzzy
 msgid "Drop..."
 msgstr "Upuść"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Podziel"
 
@@ -1029,17 +1026,17 @@ msgid "Weight:"
 msgstr "Waga:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Przechowaj"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Pobierz"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Upuść"
@@ -1318,8 +1315,7 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Kij"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid "> Next"
 msgstr "Następna"
@@ -1466,7 +1462,7 @@ msgid "Show Items"
 msgstr "Pokaż imię"
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
 msgstr ""
 
@@ -1503,8 +1499,8 @@ msgstr "@@chat|Dodaj do czatu@@"
 msgid "Pick up"
 msgstr "Podnieś"
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Dodaj do czatu@@"
@@ -1518,8 +1514,8 @@ msgstr ""
 msgid "Rename"
 msgstr "Zapamiętaj użytkownika"
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 #, fuzzy
 msgid "Remove"
 msgstr "Zapamiętaj użytkownika"
@@ -1579,96 +1575,98 @@ msgstr "Duża"
 msgid "Change guild position"
 msgstr "Zmień"
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 #, fuzzy
 msgid "Store 10"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 #, fuzzy
 msgid "Store half"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 #, fuzzy
 msgid "Store all"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Pobierz"
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Pobierz"
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Pobierz"
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 #, fuzzy
 msgid "(default)"
 msgstr "Domyślny"
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 #, fuzzy
 msgid "Move up"
 msgstr "Przesuń w górę"
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 #, fuzzy
 msgid "Move down"
 msgstr "Przesuń w dół"
@@ -3702,7 +3700,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:68
 #, fuzzy
-msgid "Smiles"
+msgid "Smilies"
 msgstr "Emotikonka"
 
 #: src/gui/windowmenu.cpp:70
@@ -5371,7 +5369,7 @@ msgstr "Pomyślnie utworzono grupę."
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, fuzzy, c-format
-msgid "%s has join your party."
+msgid "%s has joined your party."
 msgstr "%s opuścił twoją grupę."
 
 #: src/net/tmwa/partyhandler.cpp:177
@@ -5391,7 +5389,7 @@ msgstr "%s jest od teraz członkiem twojej grupy."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
@@ -5488,7 +5486,7 @@ msgstr "Nosisz więcej, niż połowa twojej wagi. Nie możesz odzyskiwać zdrowi
 
 #: src/net/tmwa/playerhandler.cpp:351
 #, fuzzy
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Nosisz więcej, niż połowa twojej wagi. Nie możesz odzyskiwać zdrowia."
 
 #: src/net/tmwa/playerhandler.cpp:456
@@ -5627,7 +5625,7 @@ msgstr ""
 
 #: src/net/tmwa/tradehandler.cpp:258
 #, fuzzy
-msgid "Failed adding item. You cant trade this item."
+msgid "Failed adding item. You can't trade this item."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
 "rodzaj przedmiotu w okienku."
@@ -5682,6 +5680,14 @@ msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
 #, fuzzy
+#~ msgid "Map actors count: %d"
+#~ msgstr "Statystyki postaci w porządku."
+
+#, fuzzy
+#~ msgid "Smiles"
+#~ msgstr "Emotikonka"
+
+#, fuzzy
 #~ msgid "@@trade|Trade@@"
 #~ msgstr "@@trade|Handel z %s@@"
 
diff --git a/po/pt.po b/po/pt.po
index f2df170d6..b7bf990ca 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,20 +1,19 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
-"PO-Revision-Date: 2011-04-27 20:40+0000\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"PO-Revision-Date: 2011-05-22 13:59+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Portuguese <>\n"
-"Language: pt\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1028
@@ -125,11 +124,11 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/commandhandler.cpp:407
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
-"já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
+" já existe ou é você mesmo."
 
 #: src/commandhandler.cpp:427
 #, c-format
@@ -261,19 +260,16 @@ msgid "font cache size"
 msgstr "Tamanho do cache de fonte"
 
 #: src/commandhandler.cpp:1092
-#, fuzzy
 msgid "Cache size:"
-msgstr "Tamanho do cache de fonte"
+msgstr ""
 
 #: src/commandhandler.cpp:1096
-#, fuzzy
 msgid "Created:"
-msgstr "Criado:"
+msgstr ""
 
 #: src/commandhandler.cpp:1098
-#, fuzzy
 msgid "Deleted:"
-msgstr "Deletado:"
+msgstr ""
 
 #: src/commandhandler.cpp:1145 src/commandhandler.cpp:1152
 msgid "Resource images:"
@@ -286,8 +282,7 @@ msgstr ""
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:232 src/gui/widgets/chattab.cpp:398
 msgid "General"
@@ -439,10 +434,10 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -601,19 +596,16 @@ msgid "Change Email"
 msgstr "Alterar email"
 
 #: src/gui/charselectdialog.cpp:252
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Cabelo incorreto."
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:285
-#, fuzzy
 msgid "Enter password for deleting character"
-msgstr "Falha ao deletar personagem."
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:285
-#, fuzzy
 msgid "Enter password:"
-msgstr "Senha incorreta."
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
@@ -732,146 +724,136 @@ msgid "Map"
 msgstr "Mapa"
 
 #: src/gui/debugwindow.cpp:69
-#, fuzzy
 msgid "Target"
-msgstr "Alvo:"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:70
-#, fuzzy
 msgid "Net"
-msgstr "Próximo"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 msgid "Music:"
 msgstr "Música:"
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 msgid "Map:"
 msgstr "Mapa:"
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 msgid "Minimap:"
 msgstr "Minimapa:"
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr "Cursor: (%d, %d)"
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+msgid "Cursor:"
+msgstr "Cursor:"
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 msgid "Player Position:"
 msgstr "Sua posição:"
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, c-format
-msgid "Particle count: %d"
-msgstr "Contagem de partículas: %d"
+#: src/gui/debugwindow.cpp:140
+msgid "Particle count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:141
-#, c-format
-msgid "Map actors count: %d"
-msgstr "Jogadores no mapa: %d"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
+msgstr "Jogadores no mapa:"
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (software)"
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (rápido OpenGL)"
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (velho OpenGL)"
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
-#, fuzzy
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
-msgstr "Jogadores no mapa:"
-
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-msgid "Cursor:"
-msgstr "Cursor:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
-msgstr "Jogadores no mapa:"
+#: src/gui/debugwindow.cpp:219
+#, c-format
+msgid "Particle count: %d"
+msgstr "Contagem de partículas: %d"
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 msgid "Target:"
 msgstr "Alvo:"
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 msgid "Target Id:"
 msgstr "ID do alvo:"
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 msgid "Target Level:"
 msgstr "Nível do alvo:"
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 msgid "Target Party:"
 msgstr "Grupo do alvo:"
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 msgid "Target Guild:"
 msgstr "Guilda do alvo:"
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
-#, fuzzy
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 msgid "Attack delay:"
-msgstr "Atraso de ataque"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
-#, fuzzy
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 msgid "Minimal hit:"
-msgstr "Minimapa:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
-#, fuzzy
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 msgid "Critical hit:"
-msgstr "Golpe crítico"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr "Ping: %d ms"
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr "Ping: ? ms"
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrada: %d bytes/s"
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
@@ -888,8 +870,8 @@ msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -933,26 +915,26 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Dividir"
 
@@ -966,17 +948,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Descartar"
@@ -1241,8 +1223,7 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Limpar"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 msgid "> Next"
 msgstr "> Próximo"
 
@@ -1292,18 +1273,16 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:351
 #: src/gui/popupmenu.cpp:592
-#, fuzzy
 msgid "Be friend"
-msgstr "amigo"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:148
 #: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:353
 #: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:378
 #: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
 #: src/gui/popupmenu.cpp:626
-#, fuzzy
 msgid "Disregard"
-msgstr "Desconsiderado"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:152
 #: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:168
@@ -1311,18 +1290,16 @@ msgstr "Desconsiderado"
 #: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:373
 #: src/gui/popupmenu.cpp:597 src/gui/popupmenu.cpp:605
 #: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:619
-#, fuzzy
 msgid "Erase"
-msgstr "Apagado"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:166
 #: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:365
 #: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
 #: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:618
 #: src/gui/popupmenu.cpp:624
-#, fuzzy
 msgid "Unignore"
-msgstr "Ignora"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:177
 #: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:380
@@ -1333,61 +1310,52 @@ msgstr "Ignorar completamente"
 
 #: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:388
 #: src/gui/popupmenu.cpp:636
-#, fuzzy
 msgid "Follow"
-msgstr "Seguindo:"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:389
 #: src/gui/popupmenu.cpp:637
-#, fuzzy
 msgid "Imitation"
-msgstr "Imitando:"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:658
-#, fuzzy
 msgid "Invite to party"
-msgstr "Convite de membros para o grupo"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:398
 #: src/gui/popupmenu.cpp:663
-#, fuzzy
 msgid "Kick from party"
-msgstr "@@kick party|Expulsar do grupo@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:409
 #: src/gui/popupmenu.cpp:677
-#, fuzzy
 msgid "Kick from guild"
-msgstr "Você foi expulso da Guilda."
+msgstr ""
 
 #: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:411
 #: src/gui/popupmenu.cpp:679
-#, fuzzy
 msgid "Change pos in guild"
-msgstr "@@guild-pos|Mudar posição da guilda >@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:416
 #: src/gui/popupmenu.cpp:685
-#, fuzzy
 msgid "Invite to guild"
-msgstr "Convite de membros para a Guilda."
+msgstr ""
 
 #: src/gui/popupmenu.cpp:233
-#, fuzzy
 msgid "Kick player"
-msgstr "Jogador VIP."
+msgstr ""
 
 #: src/gui/popupmenu.cpp:235
 msgid "Nuke"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:639
-#, fuzzy
 msgid "Show Items"
-msgstr "Mostrar nível"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
 msgstr ""
 
@@ -1404,27 +1372,23 @@ msgid "Add to priority attack list"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:289
-#, fuzzy
 msgid "Add to attack list"
-msgstr "Add. todos na negociação"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:292
-#, fuzzy
 msgid "Add to ignore list"
-msgstr "Add. todos na negociação"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:305 src/gui/popupmenu.cpp:427
-#, fuzzy
 msgid "Add name to chat"
-msgstr "Nome no chat"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:453
-#, fuzzy
 msgid "Pick up"
-msgstr "Pegar item"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 msgid "Add to chat"
 msgstr "Nome no chat"
 
@@ -1433,28 +1397,25 @@ msgid "Map Item"
 msgstr "Mapa Item"
 
 #: src/gui/popupmenu.cpp:472
-#, fuzzy
 msgid "Rename"
-msgstr "Remover nome"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 msgid "Remove"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:487
-#, fuzzy
 msgid "Load old outfits"
-msgstr "Carregar antigos atalhos de item"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:503 src/gui/windowmenu.cpp:93
 msgid "Spells"
 msgstr "Feitiços"
 
 #: src/gui/popupmenu.cpp:505
-#, fuzzy
 msgid "Load old spells"
-msgstr "@@load old spells|Carregar antigos feitiços@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:506
 msgid "Edit spell"
@@ -1492,84 +1453,86 @@ msgstr "Sair"
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 msgid "Move down"
 msgstr ""
 
@@ -3119,7 +3082,8 @@ msgid "Change"
 msgstr "Mudar"
 
 #: src/gui/tradewindow.cpp:314
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3275,19 +3239,16 @@ msgid "Portal Highlight"
 msgstr "Destaque do portal"
 
 #: src/gui/userpalette.cpp:149
-#, fuzzy
 msgid "Default collision Highlight"
-msgstr "Destaque de colisão"
+msgstr ""
 
 #: src/gui/userpalette.cpp:151
-#, fuzzy
 msgid "Air collision Highlight"
-msgstr "Destaque de colisão"
+msgstr ""
 
 #: src/gui/userpalette.cpp:153
-#, fuzzy
 msgid "Water collision Highlight"
-msgstr "Destaque de colisão"
+msgstr ""
 
 #: src/gui/userpalette.cpp:155
 msgid "Walkable Highlight"
@@ -3470,7 +3431,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -3495,8 +3457,8 @@ msgid "KS"
 msgstr "KS"
 
 #: src/gui/windowmenu.cpp:68
-msgid "Smiles"
-msgstr "Smiles"
+msgid "Smilies"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:70
 msgid "STA"
@@ -4909,7 +4871,8 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/tmwa/gui/partytab.cpp:106
 msgid "This command changes the party's experience sharing policy."
-msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
+msgstr ""
+"Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:108
 msgid ""
@@ -4926,7 +4889,8 @@ msgstr "Comando: /exp"
 #: src/net/tmwa/gui/partytab.cpp:112
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
-"Este comando exibe a atual opção de compartilhamento de experiência do grupo."
+"Este comando exibe a atual opção de compartilhamento de experiência do "
+"grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:146 src/net/tmwa/partyhandler.cpp:287
 msgid "Item sharing enabled."
@@ -5046,8 +5010,8 @@ msgstr "Grupo criado."
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, c-format
-msgid "%s has join your party."
-msgstr "%s entrou em seu grupo"
+msgid "%s has joined your party."
+msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:177
 #, c-format
@@ -5066,8 +5030,8 @@ msgstr "%s agora é um membro do seu grupo."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
-msgstr "%s não pode entrar pois a Guilda está cheia."
+msgid "%s can't join your party because party is full."
+msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
 #, c-format
@@ -5160,16 +5124,15 @@ msgstr "Mensagem"
 
 #: src/net/tmwa/playerhandler.cpp:341
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
 #: src/net/tmwa/playerhandler.cpp:351
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
-"Você está carregando mais que a metade de seu peso. Você não poderá mais "
-"recuperar HP."
 
 #: src/net/tmwa/playerhandler.cpp:456
 #, c-format
@@ -5304,8 +5267,8 @@ msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
 
 #: src/net/tmwa/tradehandler.cpp:258
-msgid "Failed adding item. You cant trade this item."
-msgstr "Falha ao adicionar item. Você não pode trocar este item."
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
 
 #: src/net/tmwa/tradehandler.cpp:262
 msgid "Failed adding item for unknown reason."
@@ -5356,107 +5319,4 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
-#~ msgid "@@trade|Trade@@"
-#~ msgstr "@@trade|Negociar@@"
-
-#~ msgid "@@attack|Attack@@"
-#~ msgstr "@@attack|Atacar@@"
-
-#~ msgid "@@whisper|Whisper@@"
-#~ msgstr "@@whisper|Mensagem privada@@"
-
-#~ msgid "@@heal|Heal@@"
-#~ msgstr "@@heal|Curar@@"
-
-#~ msgid "@@friend|Be friend@@"
-#~ msgstr "@@friend|Ser Amigo@@"
-
-#~ msgid "@@disregard|Disregard@@"
-#~ msgstr "@@disregard|Desconsiderar@@"
-
-#~ msgid "@@ignore|Ignore@@"
-#~ msgstr "@@ignore|Ignorar@@"
-
-#~ msgid "@@erase|Erase@@"
-#~ msgstr "@@erase|Apagar@@"
-
-#~ msgid "@@unignore|Unignore@@"
-#~ msgstr "@@unignore|Parar de ignorar@@"
-
-#~ msgid "@@ignore|Completely ignore@@"
-#~ msgstr "@@ignore|Ignorar completamente@@"
-
-#~ msgid "@@follow|Follow@@"
-#~ msgstr "@@follow|Seguir@@"
-
-#~ msgid "@@imitation|Imitation@@"
-#~ msgstr "@@imitation|Imitar@@"
-
-#~ msgid "@@party|Invite to party@@"
-#~ msgstr "@@party|Convidar para o grupo@@"
-
-#~ msgid "@@guild-kick|Kick from guild@@"
-#~ msgstr "@@guild-kick|Expulsar da guilda@@"
-
-#~ msgid "@@guild|Invite to guild@@"
-#~ msgstr "@@guild|Convidar para a guilda@@"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Expulsar jogador@@"
-
-#~ msgid "@@nuke|Nuke@@"
-#~ msgstr "@@nuke|Tornar invisível@@"
-
-#~ msgid "@@move|Move@@"
-#~ msgstr "@@move|Mover@@"
-
-#~ msgid "@@undress|Undress@@"
-#~ msgstr "@@undress|Remover@@"
-
-#~ msgid "@@buy|Buy@@"
-#~ msgstr "@@buy|Comprar@@"
-
-#~ msgid "@@sell|Sell@@"
-#~ msgstr "@@sell|Vender@@"
-
-#~ msgid "@@talk|Talk@@"
-#~ msgstr "@@talk|Conversar@@"
-
-#~ msgid "@@admin-kick|Kick@@"
-#~ msgstr "@@admin-kick|Expulsar@@"
-
-#~ msgid "@@name|Add name to chat@@"
-#~ msgstr "@@name|Nome para o chat@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Cancelar@@"
-
-#~ msgid "@@player_%u|%s >@@"
-#~ msgstr "@@player_%u|%s >@@"
-
-#~ msgid "@@pickup|Pick up@@"
-#~ msgstr "@@pickup|Pegar@@"
-
-#~ msgid "@@chat|Add to chat@@"
-#~ msgstr "@@chat|Adicionar para o chat@@"
-
-#~ msgid "@@rename map|Rename@@"
-#~ msgstr "@@renomear mapa|Renomear@@"
-
-#~ msgid "@@remove map|Remove@@"
-#~ msgstr "@@remove map|Remover do mapa@@"
-
-#~ msgid "@@load old outfits|Load old outfits@@"
-#~ msgstr "@@load old outfits|Carregar antigos roupas@@"
-
-#~ msgid "@@edit spell|Edit spell@@"
-#~ msgstr "@@edit spell|Editar feitiço@@"
-
-#~ msgid "@@chat close|Close@@"
-#~ msgstr "@@chat close|Fechar@@"
-
-#~ msgid "@@leave party|Leave@@"
-#~ msgstr "@@leave party|Deixar grupo@@"
 
-#~ msgid "@@guild-pos-%d|%s@@"
-#~ msgstr "@@guild-pos-%d|%s@@"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fca921e4b..0c8833891 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,20 +1,19 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
-"PO-Revision-Date: 2011-04-27 20:40+0000\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"PO-Revision-Date: 2011-05-22 13:59+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (Brazilian) <>\n"
-"Language: pt_BR\n"
+"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/manaplus/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:1028
@@ -125,11 +124,11 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/commandhandler.cpp:407
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
-"já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
+" já existe ou é você mesmo."
 
 #: src/commandhandler.cpp:427
 #, c-format
@@ -261,17 +260,14 @@ msgid "font cache size"
 msgstr "Tamanho de fonte Cache"
 
 #: src/commandhandler.cpp:1092
-#, fuzzy
 msgid "Cache size:"
-msgstr "Tamanho de fonte Cache"
+msgstr "Tamanho de cache:"
 
 #: src/commandhandler.cpp:1096
-#, fuzzy
 msgid "Created:"
 msgstr "Criado:"
 
 #: src/commandhandler.cpp:1098
-#, fuzzy
 msgid "Deleted:"
 msgstr "Deletado:"
 
@@ -286,8 +282,7 @@ msgstr ""
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:232 src/gui/widgets/chattab.cpp:398
 msgid "General"
@@ -439,10 +434,10 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -601,19 +596,16 @@ msgid "Change Email"
 msgstr "Alterar email"
 
 #: src/gui/charselectdialog.cpp:252
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Cabelo incorreto."
+msgstr "Senha incorreta"
 
 #: src/gui/charselectdialog.cpp:285
-#, fuzzy
 msgid "Enter password for deleting character"
-msgstr "Falha ao deletar personagem."
+msgstr "Entre com a senha para apagar o personagem"
 
 #: src/gui/charselectdialog.cpp:285
-#, fuzzy
 msgid "Enter password:"
-msgstr "Senha incorreta."
+msgstr "Entre com a senha:"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
@@ -732,146 +724,136 @@ msgid "Map"
 msgstr "Mapa"
 
 #: src/gui/debugwindow.cpp:69
-#, fuzzy
 msgid "Target"
-msgstr "Alvo:"
+msgstr "Alvo"
 
 #: src/gui/debugwindow.cpp:70
-#, fuzzy
 msgid "Net"
-msgstr "Próximo"
+msgstr "Rede"
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 msgid "Music:"
 msgstr "Música:"
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 msgid "Map:"
 msgstr "Mapa:"
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 msgid "Minimap:"
 msgstr "Minimapa:"
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr "Cursor: (%d, %d)"
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+msgid "Cursor:"
+msgstr "Cursor:"
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 msgid "Player Position:"
 msgstr "Sua posição:"
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, c-format
-msgid "Particle count: %d"
-msgstr "Contagem de partículas: %d"
+#: src/gui/debugwindow.cpp:140
+msgid "Particle count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:141
-#, c-format
-msgid "Map actors count: %d"
-msgstr "Jogadores no mapa: %d"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
+msgstr "Jogadores no mapa:"
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (software)"
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (rápido OpenGL)"
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (velho OpenGL)"
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
-#, fuzzy
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
-msgstr "Jogadores no mapa:"
+msgstr "Contador de texturas:"
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-msgid "Cursor:"
-msgstr "Cursor:"
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
-msgstr "Jogadores no mapa:"
+#: src/gui/debugwindow.cpp:219
+#, c-format
+msgid "Particle count: %d"
+msgstr "Contagem de partículas: %d"
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 msgid "Target:"
 msgstr "Alvo:"
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 msgid "Target Id:"
 msgstr "ID do alvo:"
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 msgid "Target Level:"
 msgstr "Nível do alvo:"
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 msgid "Target Party:"
 msgstr "Grupo do alvo:"
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 msgid "Target Guild:"
 msgstr "Guilda do alvo:"
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
-#, fuzzy
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 msgid "Attack delay:"
-msgstr "Atraso de ataque"
+msgstr "Atarso de ataque:"
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
-#, fuzzy
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 msgid "Minimal hit:"
-msgstr "Minimapa:"
+msgstr "Hit minimo:"
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
-msgstr ""
+msgstr "Hit máximo:"
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
-#, fuzzy
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 msgid "Critical hit:"
-msgstr "Golpe crítico"
+msgstr "Hit crítico:"
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr "Ping: %d ms"
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr "Ping: ? ms"
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrada: %d bytes/s"
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
@@ -888,8 +870,8 @@ msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -933,26 +915,26 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Dividir"
 
@@ -966,17 +948,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Descartar"
@@ -1241,8 +1223,7 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Limpar"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 msgid "> Next"
 msgstr "> Próximo"
 
@@ -1284,26 +1265,24 @@ msgstr "Negócios"
 
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:345
 msgid "Whisper"
-msgstr ""
+msgstr "Susurro:"
 
 #: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:585
 msgid "Heal"
-msgstr ""
+msgstr "Cura"
 
 #: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:351
 #: src/gui/popupmenu.cpp:592
-#, fuzzy
 msgid "Be friend"
-msgstr "amigo"
+msgstr "Ser amigo"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:148
 #: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:353
 #: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:378
 #: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
 #: src/gui/popupmenu.cpp:626
-#, fuzzy
 msgid "Disregard"
-msgstr "Desconsiderado"
+msgstr "Ser inimigo"
 
 #: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:152
 #: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:168
@@ -1311,18 +1290,16 @@ msgstr "Desconsiderado"
 #: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:373
 #: src/gui/popupmenu.cpp:597 src/gui/popupmenu.cpp:605
 #: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:619
-#, fuzzy
 msgid "Erase"
-msgstr "Apagado"
+msgstr "Apagar"
 
 #: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:166
 #: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:365
 #: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
 #: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:618
 #: src/gui/popupmenu.cpp:624
-#, fuzzy
 msgid "Unignore"
-msgstr "Ignora"
+msgstr "Não ignorar"
 
 #: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:177
 #: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:380
@@ -1333,98 +1310,85 @@ msgstr "Ignorar completamente"
 
 #: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:388
 #: src/gui/popupmenu.cpp:636
-#, fuzzy
 msgid "Follow"
-msgstr "Seguindo:"
+msgstr "Seguir"
 
 #: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:389
 #: src/gui/popupmenu.cpp:637
-#, fuzzy
 msgid "Imitation"
-msgstr "Imitando:"
+msgstr "Imitar"
 
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:658
-#, fuzzy
 msgid "Invite to party"
-msgstr "Convite de membros para o grupo"
+msgstr "Convidar para grupo"
 
 #: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:398
 #: src/gui/popupmenu.cpp:663
-#, fuzzy
 msgid "Kick from party"
-msgstr "@@kick party|Expulsar do grupo@@"
+msgstr "Expulsar do grupo"
 
 #: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:409
 #: src/gui/popupmenu.cpp:677
-#, fuzzy
 msgid "Kick from guild"
-msgstr "Você foi expulso da Guilda."
+msgstr "Expulsar da guilda"
 
 #: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:411
 #: src/gui/popupmenu.cpp:679
-#, fuzzy
 msgid "Change pos in guild"
-msgstr "@@guild-pos|Mudar posição da guilda >@@"
+msgstr "Mudar pos na Guilda"
 
 #: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:416
 #: src/gui/popupmenu.cpp:685
-#, fuzzy
 msgid "Invite to guild"
-msgstr "Convite de membros para a Guilda."
+msgstr "Convidar pra Guilda"
 
 #: src/gui/popupmenu.cpp:233
-#, fuzzy
 msgid "Kick player"
-msgstr "Jogador VIP."
+msgstr "Chutar Jogador"
 
 #: src/gui/popupmenu.cpp:235
 msgid "Nuke"
-msgstr ""
+msgstr "Nu"
 
 #: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:639
-#, fuzzy
 msgid "Show Items"
-msgstr "Mostrar nível"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
-msgstr ""
+msgstr "Despir"
 
 #: src/gui/popupmenu.cpp:270
 msgid "Kick"
-msgstr ""
+msgstr "Chutar"
 
 #: src/gui/popupmenu.cpp:281
 msgid "Remove from attack list"
-msgstr ""
+msgstr "Remover da lista de ataque"
 
 #: src/gui/popupmenu.cpp:287
 msgid "Add to priority attack list"
-msgstr ""
+msgstr "Adicionar na prioridade da lista de ataques"
 
 #: src/gui/popupmenu.cpp:289
-#, fuzzy
 msgid "Add to attack list"
-msgstr "Add. todos na negociação"
+msgstr "Adicionar a lista de ataques"
 
 #: src/gui/popupmenu.cpp:292
-#, fuzzy
 msgid "Add to ignore list"
-msgstr "Add. todos na negociação"
+msgstr "Adicionar a lista de ignorados"
 
 #: src/gui/popupmenu.cpp:305 src/gui/popupmenu.cpp:427
-#, fuzzy
 msgid "Add name to chat"
-msgstr "Nome no chat"
+msgstr "Adicionar nome ao chat"
 
 #: src/gui/popupmenu.cpp:453
-#, fuzzy
 msgid "Pick up"
-msgstr "Pegar item"
+msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 msgid "Add to chat"
 msgstr "Nome no chat"
 
@@ -1433,32 +1397,29 @@ msgid "Map Item"
 msgstr "Mapa Item"
 
 #: src/gui/popupmenu.cpp:472
-#, fuzzy
 msgid "Rename"
-msgstr "Remover o nome"
+msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 msgid "Remove"
-msgstr ""
+msgstr "Remover"
 
 #: src/gui/popupmenu.cpp:487
-#, fuzzy
 msgid "Load old outfits"
-msgstr "Carregar antigos atalhos de item"
+msgstr "Carregar velhas roupas"
 
 #: src/gui/popupmenu.cpp:503 src/gui/windowmenu.cpp:93
 msgid "Spells"
 msgstr "Feitiços"
 
 #: src/gui/popupmenu.cpp:505
-#, fuzzy
 msgid "Load old spells"
-msgstr "@@load old spells|Carregar antigos feitiços@@"
+msgstr "Carregar velhos feitiços"
 
 #: src/gui/popupmenu.cpp:506
 msgid "Edit spell"
-msgstr ""
+msgstr "Editar feitiços"
 
 #: src/gui/popupmenu.cpp:532
 msgid "Disable highlight"
@@ -1492,86 +1453,88 @@ msgstr "Sair"
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
-msgstr ""
+msgstr "Zerar barra amarela"
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 msgid "(default)"
-msgstr ""
+msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 msgid "Move up"
-msgstr ""
+msgstr "Mover para cima"
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 msgid "Move down"
-msgstr ""
+msgstr "Mover para baixo"
 
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
@@ -1990,7 +1953,7 @@ msgstr "Mostrar minimapas grandes"
 
 #: src/gui/setup_other.cpp:192
 msgid "Enable attack filter"
-msgstr ""
+msgstr "Habilitar filtro de ataque"
 
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
@@ -2462,19 +2425,19 @@ msgstr "Nav"
 
 #: src/gui/socialwindow.cpp:783
 msgid "Atk"
-msgstr ""
+msgstr "Ataque"
 
 #: src/gui/socialwindow.cpp:824
 msgid "Priority mobs"
-msgstr ""
+msgstr "Mobs prioritarios "
 
 #: src/gui/socialwindow.cpp:856
 msgid "Attack mobs"
-msgstr ""
+msgstr "Atacar mobs"
 
 #: src/gui/socialwindow.cpp:891
 msgid "Ignore mobs"
-msgstr ""
+msgstr "Ignorar mobs"
 
 #: src/gui/socialwindow.cpp:954
 msgid "Create Guild"
@@ -3119,7 +3082,8 @@ msgid "Change"
 msgstr "Mudar"
 
 #: src/gui/tradewindow.cpp:314
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3275,19 +3239,16 @@ msgid "Portal Highlight"
 msgstr "Destaque do portal"
 
 #: src/gui/userpalette.cpp:149
-#, fuzzy
 msgid "Default collision Highlight"
-msgstr "Destaque de colisão"
+msgstr "Destaque de colisão padrão"
 
 #: src/gui/userpalette.cpp:151
-#, fuzzy
 msgid "Air collision Highlight"
-msgstr "Destaque de colisão"
+msgstr "Destaque de colisão de ar"
 
 #: src/gui/userpalette.cpp:153
-#, fuzzy
 msgid "Water collision Highlight"
-msgstr "Destaque de colisão"
+msgstr "Destaque de colisão de água"
 
 #: src/gui/userpalette.cpp:155
 msgid "Walkable Highlight"
@@ -3470,7 +3431,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -3495,8 +3457,8 @@ msgid "KS"
 msgstr "KS"
 
 #: src/gui/windowmenu.cpp:68
-msgid "Smiles"
-msgstr "Smiles"
+msgid "Smilies"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:70
 msgid "STA"
@@ -4909,7 +4871,8 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/tmwa/gui/partytab.cpp:106
 msgid "This command changes the party's experience sharing policy."
-msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
+msgstr ""
+"Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:108
 msgid ""
@@ -4926,7 +4889,8 @@ msgstr "Comando: /exp"
 #: src/net/tmwa/gui/partytab.cpp:112
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
-"Este comando exibe a atual opção de compartilhamento de experiência do grupo."
+"Este comando exibe a atual opção de compartilhamento de experiência do "
+"grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:146 src/net/tmwa/partyhandler.cpp:287
 msgid "Item sharing enabled."
@@ -5001,7 +4965,7 @@ msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:178
 msgid "Client too old."
-msgstr ""
+msgstr "Cliente muito antigo."
 
 #: src/net/tmwa/loginhandler.cpp:181
 #, c-format
@@ -5014,7 +4978,7 @@ msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:188
 msgid "Server overpopulated."
-msgstr ""
+msgstr "Servidor lotado."
 
 #: src/net/tmwa/loginhandler.cpp:191
 msgid "This user name is already taken."
@@ -5022,7 +4986,7 @@ msgstr "Este nome de usuário já está em uso."
 
 #: src/net/tmwa/loginhandler.cpp:197
 msgid "Username permanently erased."
-msgstr ""
+msgstr "Usuário apagado permanentemente. "
 
 #: src/net/tmwa/network.cpp:149
 msgid "Empty address given to Network::connect()!"
@@ -5046,8 +5010,8 @@ msgstr "Grupo criado."
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, c-format
-msgid "%s has join your party."
-msgstr "%s entrou em seu grupo"
+msgid "%s has joined your party."
+msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:177
 #, c-format
@@ -5066,8 +5030,8 @@ msgstr "%s agora é um membro do seu grupo."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
-msgstr "%s não pode entrar pois a Guilda está cheia."
+msgid "%s can't join your party because party is full."
+msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
 #, c-format
@@ -5160,16 +5124,15 @@ msgstr "Mensagem"
 
 #: src/net/tmwa/playerhandler.cpp:341
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
 #: src/net/tmwa/playerhandler.cpp:351
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
-"Você está carregando mais que a metade de seu peso. Você não poderá mais "
-"recuperar HP."
 
 #: src/net/tmwa/playerhandler.cpp:456
 #, c-format
@@ -5304,8 +5267,8 @@ msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
 
 #: src/net/tmwa/tradehandler.cpp:258
-msgid "Failed adding item. You cant trade this item."
-msgstr "Falha ao adicionar item. Você não pode trocar este item."
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
 
 #: src/net/tmwa/tradehandler.cpp:262
 msgid "Failed adding item for unknown reason."
@@ -5356,107 +5319,4 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
-#~ msgid "@@trade|Trade@@"
-#~ msgstr "@@trade|Negociar@@"
-
-#~ msgid "@@attack|Attack@@"
-#~ msgstr "@@attack|Atacar@@"
-
-#~ msgid "@@whisper|Whisper@@"
-#~ msgstr "@@whisper|Mensagem privada@@"
-
-#~ msgid "@@heal|Heal@@"
-#~ msgstr "@@heal|Curar@@"
-
-#~ msgid "@@friend|Be friend@@"
-#~ msgstr "@@friend|Ser Amigo@@"
-
-#~ msgid "@@disregard|Disregard@@"
-#~ msgstr "@@disregard|Desconsiderar@@"
-
-#~ msgid "@@ignore|Ignore@@"
-#~ msgstr "@@ignore|Ignorar@@"
-
-#~ msgid "@@erase|Erase@@"
-#~ msgstr "@@erase|Apagar@@"
-
-#~ msgid "@@unignore|Unignore@@"
-#~ msgstr "@@unignore|Parar de ignorar@@"
-
-#~ msgid "@@ignore|Completely ignore@@"
-#~ msgstr "@@ignore|Ignorar completamente@@"
-
-#~ msgid "@@follow|Follow@@"
-#~ msgstr "@@follow|Seguir@@"
-
-#~ msgid "@@imitation|Imitation@@"
-#~ msgstr "@@imitation|Imitar@@"
-
-#~ msgid "@@party|Invite to party@@"
-#~ msgstr "@@party|Convidar para o grupo@@"
-
-#~ msgid "@@guild-kick|Kick from guild@@"
-#~ msgstr "@@guild-kick|Expulsar da guilda@@"
-
-#~ msgid "@@guild|Invite to guild@@"
-#~ msgstr "@@guild|Convidar para a guilda@@"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Expulsar jogador@@"
-
-#~ msgid "@@nuke|Nuke@@"
-#~ msgstr "@@nuke|Tornar invisível@@"
-
-#~ msgid "@@move|Move@@"
-#~ msgstr "@@move|Mover@@"
-
-#~ msgid "@@undress|Undress@@"
-#~ msgstr "@@undress|Remover@@"
-
-#~ msgid "@@buy|Buy@@"
-#~ msgstr "@@buy|Comprar@@"
-
-#~ msgid "@@sell|Sell@@"
-#~ msgstr "@@sell|Vender@@"
-
-#~ msgid "@@talk|Talk@@"
-#~ msgstr "@@talk|Conversar@@"
-
-#~ msgid "@@admin-kick|Kick@@"
-#~ msgstr "@@admin-kick|Expulsar@@"
-
-#~ msgid "@@name|Add name to chat@@"
-#~ msgstr "@@name|Nome para o chat@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Cancelar@@"
-
-#~ msgid "@@player_%u|%s >@@"
-#~ msgstr "@@player_%u|%s >@@"
-
-#~ msgid "@@pickup|Pick up@@"
-#~ msgstr "@@pickup|Pegar@@"
-
-#~ msgid "@@chat|Add to chat@@"
-#~ msgstr "@@chat|Adicionar para o chat@@"
-
-#~ msgid "@@rename map|Rename@@"
-#~ msgstr "@@renomear mapa|Renomear@@"
-
-#~ msgid "@@remove map|Remove@@"
-#~ msgstr "@@remove map|Remover do mapa@@"
-
-#~ msgid "@@load old outfits|Load old outfits@@"
-#~ msgstr "@@load old outfits|Carregar antigos roupas@@"
-
-#~ msgid "@@edit spell|Edit spell@@"
-#~ msgstr "@@edit spell|Editar feitiço@@"
-
-#~ msgid "@@chat close|Close@@"
-#~ msgstr "@@chat close|Fechar@@"
-
-#~ msgid "@@leave party|Leave@@"
-#~ msgstr "@@leave party|Deixar grupo@@"
 
-#~ msgid "@@guild-pos-%d|%s@@"
-#~ msgstr "@@guild-pos-%d|%s@@"
diff --git a/po/ru.po b/po/ru.po
index 5ad1a8095..2390bca2e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,23 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+# Andrei Karas <akaras@inbox.ru>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
-"PO-Revision-Date: 2011-05-09 20:33+0000\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"PO-Revision-Date: 2011-05-22 14:02+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
-"ru/)\n"
-"Language: ru\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/ru/)\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"
+"Language: ru\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"
 
 #: src/actorspritemanager.cpp:1028
 msgid "Visible on map"
@@ -127,11 +125,11 @@ msgstr "Нельзя отправлять пустые сообщения!"
 #: src/commandhandler.cpp:407
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
-"уже создана, или этот игрок вы сами."
+"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка"
+" уже создана, или этот игрок вы сами."
 
 #: src/commandhandler.cpp:427
 #, c-format
@@ -281,18 +279,16 @@ msgstr "Удалено:"
 
 #: src/commandhandler.cpp:1145 src/commandhandler.cpp:1152
 msgid "Resource images:"
-msgstr ""
+msgstr "Изображений:"
 
 #: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
 msgid "Resource orphaned images:"
-msgstr ""
+msgstr "Удаленных изображений:"
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
-"\"0\"."
+msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
 
 #: src/game.cpp:232 src/gui/widgets/chattab.cpp:398
 msgid "General"
@@ -444,10 +440,10 @@ msgstr "Продать"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -741,133 +737,129 @@ msgstr "Цель"
 msgid "Net"
 msgstr "Сеть"
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 msgid "Music:"
 msgstr "Музыка:"
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 msgid "Map:"
 msgstr "Карта:"
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 msgid "Minimap:"
 msgstr "МиниКарта:"
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr "Курсор: (%d, %d)"
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+msgid "Cursor:"
+msgstr "Курсор:"
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 msgid "Player Position:"
 msgstr "Позиция игрока:"
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, c-format
-msgid "Particle count: %d"
-msgstr "Количество частиц: %d"
+#: src/gui/debugwindow.cpp:140
+msgid "Particle count:"
+msgstr "Количество эффектов:"
 
-#: src/gui/debugwindow.cpp:141
-#, c-format
-msgid "Map actors count: %d"
-msgstr "Кол-во объектов: %d"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
+msgstr "Кол-во. объектов:"
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Программно)"
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (быстрый OpenGL)"
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (старый OpenGL)"
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
 msgstr "Количество текстур:"
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-msgid "Cursor:"
-msgstr "Курсор:"
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
-msgstr "Кол-во. объектов:"
+#: src/gui/debugwindow.cpp:219
+#, c-format
+msgid "Particle count: %d"
+msgstr "Количество частиц: %d"
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 msgid "Target:"
 msgstr "Цель:"
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 msgid "Target Id:"
 msgstr "Id цели:"
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 msgid "Target Level:"
 msgstr "Уровень цели:"
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 msgid "Target Party:"
 msgstr "Группа цели:"
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 msgid "Target Guild:"
 msgstr "Гильдия цели:"
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 msgid "Attack delay:"
 msgstr "Задержка атаки:"
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 msgid "Minimal hit:"
 msgstr "Минимальный удар:"
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
 msgstr "Максимальный удар:"
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 msgid "Critical hit:"
 msgstr "Критический удар:"
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr "Пинг: %d мсек."
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr "Пинг: ? мсек."
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Вх.: %d байт/сек."
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Исх.: %d байт/сек."
@@ -884,8 +876,8 @@ msgstr "Снаряжение"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Снять"
 
@@ -929,26 +921,26 @@ msgid "id"
 msgstr "ид"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Надеть"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Использовать"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 msgid "Drop..."
 msgstr "Бросить"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Разделить"
 
@@ -962,17 +954,17 @@ msgid "Weight:"
 msgstr "Вес:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Сохранить"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Бросить"
@@ -1237,8 +1229,7 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Очистить"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 msgid "> Next"
 msgstr "> Далее"
 
@@ -1366,12 +1357,11 @@ msgid "Nuke"
 msgstr "Уничтожить"
 
 #: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:639
-#, fuzzy
 msgid "Show Items"
-msgstr "Показать уровень"
+msgstr "Показать предметы"
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
 msgstr "Раздеть"
 
@@ -1403,8 +1393,8 @@ msgstr "Добавить имя в чат"
 msgid "Pick up"
 msgstr "Поднять"
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
@@ -1416,8 +1406,8 @@ msgstr "Элмент карты"
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 msgid "Remove"
 msgstr "Удалить"
 
@@ -1469,84 +1459,86 @@ msgstr "Покинуть"
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте"
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr "Имя:                    "
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 msgid "Add to trade"
 msgstr "Добавить к торговли"
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 msgid "Add to trade 10"
 msgstr "Добавить к торговле 10"
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 msgid "Add to trade half"
 msgstr "Добавить к торговле половину"
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 msgid "Store 10"
 msgstr "Сохранить 10"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 msgid "Store half"
 msgstr "Сохранить половину"
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 msgid "Store all"
 msgstr "Сохранить все"
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 msgid "Retrieve half"
 msgstr "Получить половину"
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 msgid "Retrieve all"
 msgstr "Получить все"
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr "Загрузить старые горячие клавиши предметов"
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr "Загрузить старые данные"
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr "Спрятать"
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr "Показать"
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 msgid "(default)"
 msgstr "(поумолчанию)"
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 msgid "Move up"
 msgstr "Передвинуть выше"
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -2251,8 +2243,8 @@ msgstr "Нет"
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
-"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
-"удалось!"
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не"
+" удалось!"
 
 #: src/gui/setup_video.cpp:539
 msgid ""
@@ -3098,7 +3090,8 @@ msgid "Change"
 msgstr "Сменить"
 
 #: src/gui/tradewindow.cpp:314
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
@@ -3441,15 +3434,16 @@ msgstr "Команда: /ignore"
 #: src/gui/widgets/whispertab.cpp:123
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
-"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих "
-"отношений с ним."
+"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих"
+" отношений с ним."
 
 #: src/gui/widgets/whispertab.cpp:128
 msgid "Command: /unignore <player>"
 msgstr "Команда: /unignore <игрок>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда прекращает игнорирование другого игрока."
 
 #: src/gui/windowmenu.cpp:62
@@ -3473,7 +3467,7 @@ msgid "KS"
 msgstr "СА"
 
 #: src/gui/windowmenu.cpp:68
-msgid "Smiles"
+msgid "Smilies"
 msgstr "Смайлы"
 
 #: src/gui/windowmenu.cpp:70
@@ -4512,7 +4506,8 @@ msgstr "Неизвестная ошибка сервера чата."
 
 #: src/net/tmwa/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
+msgstr ""
+"Невозможно создать персонажа. Скорее всего, таке имя уже используется."
 
 #: src/net/tmwa/charserverhandler.cpp:176 src/net/tmwa/loginhandler.cpp:194
 msgid "Wrong name."
@@ -4870,8 +4865,7 @@ msgstr "Команда изменяет политику разделения п
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
-msgstr ""
-"<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
+msgstr "<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
 
 #: src/net/tmwa/gui/partytab.cpp:99
 msgid "Command: /item"
@@ -4894,8 +4888,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий "
-"опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
+"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий"
+" опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
 
 #: src/net/tmwa/gui/partytab.cpp:111
 msgid "Command: /exp"
@@ -5020,8 +5014,8 @@ msgstr "Группа успешно создана."
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, c-format
-msgid "%s has join your party."
-msgstr "%s присоединился к вашей группе"
+msgid "%s has joined your party."
+msgstr "%s присоединился к группе."
 
 #: src/net/tmwa/partyhandler.cpp:177
 #, c-format
@@ -5040,8 +5034,8 @@ msgstr "%s теперь в вашей группе."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
-msgstr "%s не может присоединиться к вашей группе, потому что она заполнена"
+msgid "%s can't join your party because party is full."
+msgstr "%s не может присоединится к вашей группе, т.к. группа переполнена."
 
 #: src/net/tmwa/partyhandler.cpp:197
 #, c-format
@@ -5134,16 +5128,17 @@ msgstr "Сообщение"
 
 #: src/net/tmwa/playerhandler.cpp:341
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Вы несете груз больший, чем половина вашей грузоподъемности. Не удалось "
 "восстановить здоровье."
 
 #: src/net/tmwa/playerhandler.cpp:351
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
-"Вы несете груз меньше, чем половина вашей грузоподъемности. Вы можете "
-"восстановить здоровье."
+"Вес предметов составляет менее половины допустимого. Теперь вы можете "
+"восстанавливаться"
 
 #: src/net/tmwa/playerhandler.cpp:456
 #, c-format
@@ -5278,7 +5273,7 @@ msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Не удалось добавить предмет. У партнера по торговле кончилось место."
 
 #: src/net/tmwa/tradehandler.cpp:258
-msgid "Failed adding item. You cant trade this item."
+msgid "Failed adding item. You can't trade this item."
 msgstr "Ошибка добавления предмета. Вы не можете торговать этим предметом."
 
 #: src/net/tmwa/tradehandler.cpp:262
@@ -5329,3 +5324,5 @@ msgstr "Мана %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
+
+
diff --git a/po/sv.po b/po/sv.po
index eb93d1d92..4927c73bb 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 04:22+0300\n"
+"POT-Creation-Date: 2011-05-22 16:57+0300\n"
 "PO-Revision-Date: 2009-07-17 05:36+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -465,10 +465,10 @@ msgstr "Sälj"
 #: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
 #: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
 #: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
-#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1566 src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1638 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1833
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
 #: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
 #: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
@@ -785,146 +785,143 @@ msgstr "Gå åt vänster"
 msgid "Net"
 msgstr "Nästa"
 
-#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
-#: src/gui/debugwindow.cpp:236
+#: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
+#: src/gui/debugwindow.cpp:237
 #, fuzzy
 msgid "Music:"
 msgstr "Ämne: %s"
 
-#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:211
-#: src/gui/debugwindow.cpp:238
+#: src/gui/debugwindow.cpp:134 src/gui/debugwindow.cpp:212
+#: src/gui/debugwindow.cpp:239
 #, fuzzy
 msgid "Map:"
 msgstr "Namn: %s"
 
-#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:209
-#: src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:135 src/gui/debugwindow.cpp:210
+#: src/gui/debugwindow.cpp:238
 #, fuzzy
 msgid "Minimap:"
 msgstr "Minikarta"
 
-#: src/gui/debugwindow.cpp:136
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+#: src/gui/debugwindow.cpp:136 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:235
+#, fuzzy
+msgid "Cursor:"
+msgstr "Särskild muspekare"
 
-#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:188
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:137 src/gui/debugwindow.cpp:189
+#: src/gui/debugwindow.cpp:194
 #, fuzzy
 msgid "Player Position:"
 msgstr "Spelare slår monster"
 
-#: src/gui/debugwindow.cpp:139 src/gui/debugwindow.cpp:218
-#, fuzzy, c-format
-msgid "Particle count: %d"
+#: src/gui/debugwindow.cpp:140
+#, fuzzy
+msgid "Particle count:"
 msgstr "Partikeleffekter"
 
-#: src/gui/debugwindow.cpp:141
-#, fuzzy, c-format
-msgid "Map actors count: %d"
-msgstr "Karaktärens värden okej"
+#: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
+#: src/gui/debugwindow.cpp:242
+msgid "Map actors count:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:160
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:161
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:153
+#: src/gui/debugwindow.cpp:154
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:157
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:163
+#: src/gui/debugwindow.cpp:164
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
+#: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
-#, fuzzy
-msgid "Cursor:"
-msgstr "Särskild muspekare"
-
-#: src/gui/debugwindow.cpp:222 src/gui/debugwindow.cpp:241
-msgid "Map actors count:"
-msgstr ""
+#: src/gui/debugwindow.cpp:219
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Partikeleffekter"
 
-#: src/gui/debugwindow.cpp:255 src/gui/debugwindow.cpp:286
-#: src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:331
 #, fuzzy
 msgid "Target:"
 msgstr "Gå åt vänster"
 
-#: src/gui/debugwindow.cpp:256 src/gui/debugwindow.cpp:291
-#: src/gui/debugwindow.cpp:331
+#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:292
+#: src/gui/debugwindow.cpp:332
 #, fuzzy
 msgid "Target Id:"
 msgstr "Välj spelare"
 
-#: src/gui/debugwindow.cpp:257 src/gui/debugwindow.cpp:295
-#: src/gui/debugwindow.cpp:300 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:296
+#: src/gui/debugwindow.cpp:301 src/gui/debugwindow.cpp:333
 #, fuzzy
 msgid "Target Level:"
 msgstr "Välj spelare"
 
-#: src/gui/debugwindow.cpp:258 src/gui/debugwindow.cpp:303
-#: src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:334
 #, fuzzy
 msgid "Target Party:"
 msgstr "Välj spelare"
 
-#: src/gui/debugwindow.cpp:259 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:307
+#: src/gui/debugwindow.cpp:335
 #, fuzzy
 msgid "Target Guild:"
 msgstr "Välj spelare"
 
-#: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
-#: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:336
 #, fuzzy
 msgid "Attack delay:"
 msgstr "Attack %+d"
 
-#: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:336
+#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
+#: src/gui/debugwindow.cpp:337
 #, fuzzy
 msgid "Minimal hit:"
 msgstr "Minikarta"
 
-#: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
+#: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
-#: src/gui/debugwindow.cpp:338
+#: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
+#: src/gui/debugwindow.cpp:339
 #, fuzzy
 msgid "Critical hit:"
 msgstr "Kritisk träff"
 
-#: src/gui/debugwindow.cpp:372
+#: src/gui/debugwindow.cpp:373
 #, c-format
 msgid "Ping: %d ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:377
+#: src/gui/debugwindow.cpp:378
 msgid "Ping: ? ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:380
+#: src/gui/debugwindow.cpp:381
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:382
+#: src/gui/debugwindow.cpp:383
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -941,8 +938,8 @@ msgstr "Utrustning"
 
 #: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1651
+#: src/gui/popupmenu.cpp:1530 src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1653
 msgid "Unequip"
 msgstr "Avrusta"
 
@@ -989,27 +986,27 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1532
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1655
 msgid "Equip"
 msgstr "Utrusta"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1588 src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1658
 msgid "Use"
 msgstr "Använd"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1538 src/gui/popupmenu.cpp:1623
+#: src/gui/popupmenu.cpp:1661
 #, fuzzy
 msgid "Drop..."
 msgstr "Släpp"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
-#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1543
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1666
 msgid "Split"
 msgstr "Dela"
 
@@ -1023,17 +1020,17 @@ msgid "Weight:"
 msgstr "Vikt:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
-#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1511 src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1669 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Lagra"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1550
 msgid "Retrieve"
 msgstr "Hämta"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
-#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1540
+#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1663
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Släpp"
@@ -1313,8 +1310,7 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Spjut"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:209
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid "> Next"
 msgstr "Nästa"
@@ -1463,7 +1459,7 @@ msgid "Show Items"
 msgstr "Visa namn"
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1830
 msgid "Undress"
 msgstr ""
 
@@ -1500,8 +1496,8 @@ msgstr "@@chat|Nämn i chattfönstret@@"
 msgid "Pick up"
 msgstr "Plocka upp"
 
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Nämn i chattfönstret@@"
@@ -1515,8 +1511,8 @@ msgstr ""
 msgid "Rename"
 msgstr "Kom ihåg användarnamnet"
 
-#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
-#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 #, fuzzy
 msgid "Remove"
 msgstr "Kom ihåg användarnamnet"
@@ -1576,96 +1572,98 @@ msgstr "Stor"
 msgid "Change guild position"
 msgstr "Ändra"
 
-#: src/gui/popupmenu.cpp:1115
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1116
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1116
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1118
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1492
+#: src/gui/popupmenu.cpp:1494
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:1498
+#: src/gui/popupmenu.cpp:1500
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:1501
+#: src/gui/popupmenu.cpp:1503
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1503
+#: src/gui/popupmenu.cpp:1505
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1515
+#: src/gui/popupmenu.cpp:1517
 #, fuzzy
 msgid "Store 10"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1520
 #, fuzzy
 msgid "Store half"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1520
+#: src/gui/popupmenu.cpp:1522
 #, fuzzy
 msgid "Store all"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1554
+#: src/gui/popupmenu.cpp:1556
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Hämta"
 
-#: src/gui/popupmenu.cpp:1557
+#: src/gui/popupmenu.cpp:1559
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Hämta"
 
-#: src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1561
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Hämta"
 
-#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
+#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1636
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1674
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
+#: src/gui/popupmenu.cpp:1700 src/gui/popupmenu.cpp:1733
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1739
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 #, fuzzy
 msgid "(default)"
 msgstr "Förval"
 
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 #, fuzzy
 msgid "Move up"
 msgstr "Gå uppåt"
 
-#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 #, fuzzy
 msgid "Move down"
 msgstr "Gå nedåt"
@@ -3702,7 +3700,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:68
 #, fuzzy
-msgid "Smiles"
+msgid "Smilies"
 msgstr "Smiley"
 
 #: src/gui/windowmenu.cpp:70
@@ -5376,7 +5374,7 @@ msgstr "Grupp skapad."
 
 #: src/net/tmwa/partyhandler.cpp:141
 #, fuzzy, c-format
-msgid "%s has join your party."
+msgid "%s has joined your party."
 msgstr "%s har lämnat din grupp."
 
 #: src/net/tmwa/partyhandler.cpp:177
@@ -5396,7 +5394,7 @@ msgstr "%s är nu en medlem i din grupp."
 
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
-msgid "%s cant joid your party because party is full."
+msgid "%s can't join your party because party is full."
 msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:197
@@ -5494,7 +5492,7 @@ msgstr "Du bär mer än halva din vikt på dig. Du kan inte återfå hälsa."
 
 #: src/net/tmwa/playerhandler.cpp:351
 #, fuzzy
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Du bär mer än halva din vikt på dig. Du kan inte återfå hälsa."
 
 #: src/net/tmwa/playerhandler.cpp:456
@@ -5632,7 +5630,7 @@ msgstr "Kunde inte lägga till föremål. Bytespartnern har inget ledigt utrymme
 
 #: src/net/tmwa/tradehandler.cpp:258
 #, fuzzy
-msgid "Failed adding item. You cant trade this item."
+msgid "Failed adding item. You can't trade this item."
 msgstr ""
 "Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags "
 "sak flera gånger."
@@ -5687,6 +5685,14 @@ msgid "Unknown item"
 msgstr "Okänt föremål"
 
 #, fuzzy
+#~ msgid "Map actors count: %d"
+#~ msgstr "Karaktärens värden okej"
+
+#, fuzzy
+#~ msgid "Smiles"
+#~ msgstr "Smiley"
+
+#, fuzzy
 #~ msgid "@@trade|Trade@@"
 #~ msgstr "@@trade|Handla med %s@@"