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

New translation for Finish language. thanks for Byakushin.

1 files changed, 1091 insertions, 1020 deletions

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"
+
+