Update translations again and fix typos.

17 files changed, 840 insertions, 753 deletions

diff --git a/po/da.po b/po/da.po
index fc96c8005..9b5c2bcd4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
 "PO-Revision-Date: 2009-07-25 17:33+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -644,7 +644,7 @@ msgid "Enter password:"
 msgstr "Forkert brugernavn eller password"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
-#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Slet"
@@ -924,7 +924,7 @@ msgstr ""
 
 #: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: 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
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "OK"
 
@@ -1343,7 +1343,7 @@ msgid "Away outfit"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Handl"
@@ -2133,50 +2133,55 @@ msgstr "Ignorer"
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Tillad handel"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Tillad hviskere"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr "Placer alle hviskesamtaler i en tab"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 #, fuzzy
 msgid "Show gender"
 msgstr "Vis navn"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Brugere"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Når ignorer:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 #, fuzzy
 msgid "Show level"
 msgstr "Vis navn"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 #, fuzzy
 msgid "Show own name"
 msgstr "Vis navn"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 #, fuzzy
 msgid "Target dead players"
 msgstr "Vælg spiller som ny modstander"
 
+#: src/gui/setup_players.cpp:316
+#, fuzzy
+msgid "Secure trades"
+msgstr "Accepter handel"
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr ""
@@ -2476,7 +2481,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Tilføj"
 
@@ -3258,46 +3263,46 @@ msgstr "Vis navn"
 msgid "Save"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Foreslå handel"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Bekræftet. Venter..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Accepter handel"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Godkendt. Venter..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Handel: Dig"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Du får %s."
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Du giver:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Ændre"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på "
 "vinduet."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Du har ikke penge nok."
 
@@ -3951,7 +3956,7 @@ msgstr "Gem vinduer"
 
 #: src/keyboardconfig.cpp:147
 #, fuzzy
-msgid "Kills Stats Window"
+msgid "Kill Stats Window"
 msgstr "Statsvindue"
 
 #: src/keyboardconfig.cpp:149
@@ -4014,7 +4019,7 @@ msgid "Copy Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
+msgid "Copy equipped to Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:258
@@ -4039,12 +4044,12 @@ msgstr "Gå til næste chat tab"
 
 #: src/keyboardconfig.cpp:268
 #, fuzzy
-msgid "Previous chat tab line"
+msgid "Previous chat line"
 msgstr "Gå til sidste chat tab"
 
 #: src/keyboardconfig.cpp:270
 #, fuzzy
-msgid "Next chat tab line"
+msgid "Next chat line"
 msgstr "Gå til næste chat tab"
 
 #: src/keyboardconfig.cpp:272
@@ -4189,7 +4194,7 @@ msgid "Item is too heavy."
 msgstr ""
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
+msgid "Item is too far away."
 msgstr ""
 
 #: src/localplayer.cpp:1385
@@ -4534,7 +4539,7 @@ msgstr "Du har brugt alle dine points"
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
@@ -5059,7 +5064,7 @@ msgstr "Denne kommando får dig til at forlade din gruppe"
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
 #, fuzzy
-msgid "You already in guild."
+msgid "You are already in guild."
 msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
 
 #: src/net/tmwa/guildhandler.cpp:120
diff --git a/po/de.po b/po/de.po
index cca80af87..6bb8a3863 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
 "PO-Revision-Date: 2010-01-02 15:26+0000\n"
 "Last-Translator: Jonathan Raphael Joachim Kolberg\n"
 "Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
@@ -661,7 +661,7 @@ msgid "Enter password:"
 msgstr "Passwort:"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
-#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Löschen"
@@ -936,7 +936,7 @@ msgstr ""
 
 #: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: 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
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "Ok"
 
@@ -1355,7 +1355,7 @@ msgid "Away outfit"
 msgstr "Ausrüstung anziehen"
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Handeln"
@@ -2131,50 +2131,55 @@ msgstr "Ignoriert"
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Handeln erlauben"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Flüstern erlauben"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr "Alle privaten Nachrichten in Tabs öffnen"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 #, fuzzy
 msgid "Show gender"
 msgstr "Geschlecht"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Spieler"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Wenn ignorierend:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 #, fuzzy
 msgid "Show level"
 msgstr "Geschlecht"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 #, fuzzy
 msgid "Show own name"
 msgstr "Eigener Name"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 #, fuzzy
 msgid "Target dead players"
 msgstr "Spieler anvisieren"
 
+#: src/gui/setup_players.cpp:316
+#, fuzzy
+msgid "Secure trades"
+msgstr "Handel zustimmen"
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr ""
@@ -2478,7 +2483,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -3260,46 +3265,46 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Handel vorschlagen"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Bestätigt. Warten..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Handel zustimmen"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Zugestimmt. Warten..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Handel: Du"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Du erhältst %s."
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Du gibst:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Ändern"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
 "Gegenstände hinzufügen."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Du hast nicht genügend Geld."
 
@@ -3952,7 +3957,7 @@ msgstr "Einstellungen"
 
 #: src/keyboardconfig.cpp:147
 #, fuzzy
-msgid "Kills Stats Window"
+msgid "Kill Stats Window"
 msgstr "Statusfenster"
 
 #: src/keyboardconfig.cpp:149
@@ -4016,7 +4021,7 @@ msgstr "Ausrüstung kopieren"
 
 #: src/keyboardconfig.cpp:256
 #, fuzzy
-msgid "Copy Equiped to Outfit"
+msgid "Copy equipped to Outfit"
 msgstr "Ausrüstung kopieren"
 
 #: src/keyboardconfig.cpp:258
@@ -4041,12 +4046,12 @@ msgstr "Nächster Tab"
 
 #: src/keyboardconfig.cpp:268
 #, fuzzy
-msgid "Previous chat tab line"
+msgid "Previous chat line"
 msgstr "Voriger Tab"
 
 #: src/keyboardconfig.cpp:270
 #, fuzzy
-msgid "Next chat tab line"
+msgid "Next chat line"
 msgstr "Nächster Tab"
 
 #: src/keyboardconfig.cpp:272
@@ -4191,7 +4196,7 @@ msgid "Item is too heavy."
 msgstr ""
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
+msgid "Item is too far away."
 msgstr ""
 
 #: src/localplayer.cpp:1385
@@ -4527,7 +4532,7 @@ msgstr "Spielfigurattribute sind zu klein"
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
@@ -5029,7 +5034,7 @@ msgstr "Dieser Befehl lässt Dich die Party verlassen"
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
 #, fuzzy
-msgid "You already in guild."
+msgid "You are already in guild."
 msgstr "Fehler beim Erstellen der Gilde."
 
 #: src/net/tmwa/guildhandler.cpp:120
diff --git a/po/en_GB.po b/po/en_GB.po
index a704e579a..82297e5b9 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
 "PO-Revision-Date: 2010-03-04 21:01+0000\n"
 "Last-Translator: issyl0 <isabell121@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -647,7 +647,7 @@ msgid "Enter password:"
 msgstr "Wrong password"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
-#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Delete"
@@ -927,7 +927,7 @@ msgstr ""
 
 #: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: 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
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "OK"
 
@@ -1346,7 +1346,7 @@ msgid "Away outfit"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Trade"
@@ -2136,50 +2136,55 @@ msgstr "Ignored"
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Allow trading"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Allow whispers"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr "Put all whispers in tabs"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 #, fuzzy
 msgid "Show gender"
 msgstr "Show name"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Players"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "When ignoring:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 #, fuzzy
 msgid "Show level"
 msgstr "Show name"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 #, fuzzy
 msgid "Show own name"
 msgstr "Show name"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 #, fuzzy
 msgid "Target dead players"
 msgstr "Target Player"
 
+#: src/gui/setup_players.cpp:316
+#, fuzzy
+msgid "Secure trades"
+msgstr "Agree trade"
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr ""
@@ -2479,7 +2484,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Add"
 
@@ -3260,45 +3265,45 @@ msgstr "Show name"
 msgid "Save"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Propose trade"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Confirmed. Waiting..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Agree trade"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Agreed. Waiting..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Trade: You"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "You get %s."
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "You give:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Change"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Failed adding item. You can not overlap one kind of item on the window."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "You don't have enough money."
 
@@ -3943,7 +3948,7 @@ msgstr "Hide Windows"
 
 #: src/keyboardconfig.cpp:147
 #, fuzzy
-msgid "Kills Stats Window"
+msgid "Kill Stats Window"
 msgstr "Status Window"
 
 #: src/keyboardconfig.cpp:149
@@ -4006,7 +4011,7 @@ msgid "Copy Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
+msgid "Copy equipped to Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:258
@@ -4031,12 +4036,12 @@ msgstr "Next Chat Tab"
 
 #: src/keyboardconfig.cpp:268
 #, fuzzy
-msgid "Previous chat tab line"
+msgid "Previous chat line"
 msgstr "Previous Chat Tab"
 
 #: src/keyboardconfig.cpp:270
 #, fuzzy
-msgid "Next chat tab line"
+msgid "Next chat line"
 msgstr "Next Chat Tab"
 
 #: src/keyboardconfig.cpp:272
@@ -4181,7 +4186,7 @@ msgid "Item is too heavy."
 msgstr ""
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
+msgid "Item is too far away."
 msgstr ""
 
 #: src/localplayer.cpp:1385
@@ -4530,7 +4535,7 @@ msgstr "Character stats OK"
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
@@ -5057,7 +5062,7 @@ msgstr "This command causes the player to leave the party."
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
 #, fuzzy
-msgid "You already in guild."
+msgid "You are already in guild."
 msgstr "Error creating guild."
 
 #: src/net/tmwa/guildhandler.cpp:120
diff --git a/po/es.po b/po/es.po
index e46cd7616..0f035b442 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
-"PO-Revision-Date: 2011-05-22 13:59+0000\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
+"PO-Revision-Date: 2011-05-22 17:00+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/manaplus/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -608,7 +608,7 @@ msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
-#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Borrar"
@@ -860,7 +860,7 @@ msgstr "Out: %d bytes/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:48
-#: src/gui/tradewindow.cpp:82 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "OK"
 
@@ -1259,7 +1259,7 @@ msgid "Away outfit"
 msgstr "Fuera conjunto"
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Intercambio"
@@ -1981,46 +1981,50 @@ msgstr "Ignorado"
 msgid "Erased"
 msgstr "Borrado"
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Permitir intercambios"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Permitir mensajes privados"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr "Viejo"
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr "Mostrar nuevos susurros en pestañas"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 msgid "Show gender"
 msgstr "Mostrar género (del personaje)"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Jugadores"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Cuando se ignora a alguien:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 msgid "Show level"
 msgstr "Mostrar nivel"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 msgid "Show own name"
 msgstr "Mostrar nombre propio"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 msgid "Target dead players"
 msgstr "Apuntar a jugadores muertos"
 
+#: src/gui/setup_players.cpp:316
+msgid "Secure trades"
+msgstr ""
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr "Tema"
@@ -2301,7 +2305,7 @@ msgid "Sell items"
 msgstr "Vender artículos"
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Anadir"
 
@@ -3049,47 +3053,47 @@ msgstr "Nivel de Escuela:"
 msgid "Save"
 msgstr "Guardar"
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Proponer el intercambio"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Esperando..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Aceptar intercambio"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Aceptado. Esperando..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Intercambio: Tú"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr "Tú recibes %s"
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Tú das:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Cambiar"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "No tienes dinero suficiente."
 
@@ -3700,8 +3704,8 @@ msgid "Quick drop Window"
 msgstr "Ventana de lanzamiento de objetos"
 
 #: src/keyboardconfig.cpp:147
-msgid "Kills Stats Window"
-msgstr "Ventana de estadisticas"
+msgid "Kill Stats Window"
+msgstr ""
 
 #: src/keyboardconfig.cpp:149
 msgid "Commands Window"
@@ -3759,8 +3763,8 @@ msgid "Copy Outfit"
 msgstr "Copiar el conjunto"
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
-msgstr "Copiar lo que tiene equipado a Conjunto"
+msgid "Copy equipped to Outfit"
+msgstr ""
 
 #: src/keyboardconfig.cpp:258
 msgid "Toggle Chat"
@@ -3783,12 +3787,12 @@ msgid "Next Chat Tab"
 msgstr "Siguiente Pestaña De Chat"
 
 #: src/keyboardconfig.cpp:268
-msgid "Previous chat tab line"
-msgstr "Linea precedente de dialogo"
+msgid "Previous chat line"
+msgstr ""
 
 #: src/keyboardconfig.cpp:270
-msgid "Next chat tab line"
-msgstr "Linea siguiente de dialogo"
+msgid "Next chat line"
+msgstr ""
 
 #: src/keyboardconfig.cpp:272
 msgid "Chat Auto Complete"
@@ -3924,8 +3928,8 @@ msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
-msgstr "El artículo está muy lejos"
+msgid "Item is too far away."
+msgstr ""
 
 #: src/localplayer.cpp:1385
 msgid "Inventory is full."
@@ -4241,9 +4245,8 @@ msgstr "Atributos del personaje son muy bajos."
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
-"Al menos unas de las caracteristicas estan fuera de los limites: (%u - %u)."
 
 #: src/net/manaserv/charhandler.cpp:178
 msgid "Invalid slot number."
@@ -4719,8 +4722,8 @@ msgid "This command causes the player to leave the guild."
 msgstr "Este comando hace que dejes el clan."
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
-msgid "You already in guild."
-msgstr "Ya estás en el gremio."
+msgid "You are already in guild."
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:120
 msgid "Emperium check failed."
diff --git a/po/fi.po b/po/fi.po
index 480a84f3d..c591e0ad1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
-"PO-Revision-Date: 2011-05-22 13:59+0000\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
+"PO-Revision-Date: 2011-05-22 17:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -262,23 +262,23 @@ msgstr "kirjasinvälimuistin koko"
 
 #: src/commandhandler.cpp:1092
 msgid "Cache size:"
-msgstr ""
+msgstr "Välimuistin koko:"
 
 #: src/commandhandler.cpp:1096
 msgid "Created:"
-msgstr ""
+msgstr "Luotu:"
 
 #: src/commandhandler.cpp:1098
 msgid "Deleted:"
-msgstr ""
+msgstr "Poistettu:"
 
 #: src/commandhandler.cpp:1145 src/commandhandler.cpp:1152
 msgid "Resource images:"
-msgstr ""
+msgstr "Resurssikuvat:"
 
 #: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
 msgid "Resource orphaned images:"
-msgstr ""
+msgstr "Orvot resurssikuvat:"
 
 #: src/commandhandler.h:40
 #, c-format
@@ -600,18 +600,18 @@ msgstr "Vaihda sähköpostiosoite"
 
 #: src/gui/charselectdialog.cpp:252
 msgid "Incorrect password"
-msgstr ""
+msgstr "Väärä salasana"
 
 #: src/gui/charselectdialog.cpp:285
 msgid "Enter password for deleting character"
-msgstr ""
+msgstr "Anna salasana hahmon poistamiseksi"
 
 #: src/gui/charselectdialog.cpp:285
 msgid "Enter password:"
-msgstr ""
+msgstr "Salasana:"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
-#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Poista"
@@ -728,11 +728,11 @@ msgstr "Kartta"
 
 #: src/gui/debugwindow.cpp:69
 msgid "Target"
-msgstr ""
+msgstr "Kohde"
 
 #: src/gui/debugwindow.cpp:70
 msgid "Net"
-msgstr ""
+msgstr "Verkko"
 
 #: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:208
 #: src/gui/debugwindow.cpp:237
@@ -761,7 +761,7 @@ msgstr "Pelaajan sijainti:"
 
 #: src/gui/debugwindow.cpp:140
 msgid "Particle count:"
-msgstr ""
+msgstr "Hiukkasten määrä:"
 
 #: src/gui/debugwindow.cpp:142 src/gui/debugwindow.cpp:223
 #: src/gui/debugwindow.cpp:242
@@ -790,7 +790,7 @@ msgstr "%d FPS"
 
 #: src/gui/debugwindow.cpp:176 src/gui/debugwindow.cpp:228
 msgid "Textures count:"
-msgstr ""
+msgstr "Tekstuurien määrä:"
 
 #: src/gui/debugwindow.cpp:219
 #, c-format
@@ -825,22 +825,22 @@ 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 ""
+msgstr "Hyökkäysviive:"
 
 #: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:311
 #: src/gui/debugwindow.cpp:337
 msgid "Minimal hit:"
-msgstr ""
+msgstr "Minimivahinko:"
 
 #: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:313
 #: src/gui/debugwindow.cpp:338
 msgid "Maximum hit:"
-msgstr ""
+msgstr "Maksimivahinko:"
 
 #: src/gui/debugwindow.cpp:264 src/gui/debugwindow.cpp:315
 #: src/gui/debugwindow.cpp:339
 msgid "Critical hit:"
-msgstr ""
+msgstr "Kriittinen osuma:"
 
 #: src/gui/debugwindow.cpp:373
 #, c-format
@@ -863,7 +863,7 @@ 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:48
-#: src/gui/tradewindow.cpp:82 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "Ok"
 
@@ -1261,23 +1261,23 @@ msgid "Away outfit"
 msgstr "Poissaoloasu"
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Tee kaupat"
 
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:345
 msgid "Whisper"
-msgstr ""
+msgstr "Kuiskaa"
 
 #: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:585
 msgid "Heal"
-msgstr ""
+msgstr "Paranna"
 
 #: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:351
 #: src/gui/popupmenu.cpp:592
 msgid "Be friend"
-msgstr ""
+msgstr "Ystävysty"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:148
 #: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:353
@@ -1285,7 +1285,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
 #: src/gui/popupmenu.cpp:626
 msgid "Disregard"
-msgstr ""
+msgstr "Vaimenna"
 
 #: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:152
 #: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:168
@@ -1294,7 +1294,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:597 src/gui/popupmenu.cpp:605
 #: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:619
 msgid "Erase"
-msgstr ""
+msgstr "Pyyhi"
 
 #: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:166
 #: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:365
@@ -1302,7 +1302,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:618
 #: src/gui/popupmenu.cpp:624
 msgid "Unignore"
-msgstr ""
+msgstr "Huomioi jälleen"
 
 #: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:177
 #: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:380
@@ -1314,81 +1314,81 @@ msgstr "Jätä täysin huomiotta"
 #: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:388
 #: src/gui/popupmenu.cpp:636
 msgid "Follow"
-msgstr ""
+msgstr "Seuraa"
 
 #: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:389
 #: src/gui/popupmenu.cpp:637
 msgid "Imitation"
-msgstr ""
+msgstr "Matki"
 
 #: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:658
 msgid "Invite to party"
-msgstr ""
+msgstr "Kutsu ryhmään"
 
 #: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:398
 #: src/gui/popupmenu.cpp:663
 msgid "Kick from party"
-msgstr ""
+msgstr "Potki ryhmästä"
 
 #: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:409
 #: src/gui/popupmenu.cpp:677
 msgid "Kick from guild"
-msgstr ""
+msgstr "Potki killasta"
 
 #: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:411
 #: src/gui/popupmenu.cpp:679
 msgid "Change pos in guild"
-msgstr ""
+msgstr "Muuta kilta-asemaa"
 
 #: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:416
 #: src/gui/popupmenu.cpp:685
 msgid "Invite to guild"
-msgstr ""
+msgstr "Kutsu kiltaan"
 
 #: src/gui/popupmenu.cpp:233
 msgid "Kick player"
-msgstr ""
+msgstr "Potki pelaaja"
 
 #: src/gui/popupmenu.cpp:235
 msgid "Nuke"
-msgstr ""
+msgstr "Pommita"
 
 #: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:639
 msgid "Show Items"
-msgstr ""
+msgstr "Näytä tavarat"
 
 #: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
 #: src/gui/popupmenu.cpp:1830
 msgid "Undress"
-msgstr ""
+msgstr "Riisu"
 
 #: src/gui/popupmenu.cpp:270
 msgid "Kick"
-msgstr ""
+msgstr "Potki"
 
 #: src/gui/popupmenu.cpp:281
 msgid "Remove from attack list"
-msgstr ""
+msgstr "Poista hyökkäyslistasta"
 
 #: src/gui/popupmenu.cpp:287
 msgid "Add to priority attack list"
-msgstr ""
+msgstr "Lisää prioriteettihyökkäyslistalle"
 
 #: src/gui/popupmenu.cpp:289
 msgid "Add to attack list"
-msgstr ""
+msgstr "Lisää hyökkäyslistaan"
 
 #: src/gui/popupmenu.cpp:292
 msgid "Add to ignore list"
-msgstr ""
+msgstr "Lisää ohitettavien listaan"
 
 #: src/gui/popupmenu.cpp:305 src/gui/popupmenu.cpp:427
 msgid "Add name to chat"
-msgstr ""
+msgstr "Lisää nimi keskusteluun"
 
 #: src/gui/popupmenu.cpp:453
 msgid "Pick up"
-msgstr ""
+msgstr "Nosta"
 
 #: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1564
 #: src/gui/popupmenu.cpp:1632 src/gui/popupmenu.cpp:1670
@@ -1401,16 +1401,16 @@ msgstr "Karttaolio"
 
 #: src/gui/popupmenu.cpp:472
 msgid "Rename"
-msgstr ""
+msgstr "Nimeä uudelleen"
 
 #: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1784
 #: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1807
 msgid "Remove"
-msgstr ""
+msgstr "Poista"
 
 #: src/gui/popupmenu.cpp:487
 msgid "Load old outfits"
-msgstr ""
+msgstr "Lataa vanhat asut"
 
 #: src/gui/popupmenu.cpp:503 src/gui/windowmenu.cpp:93
 msgid "Spells"
@@ -1418,11 +1418,11 @@ msgstr "Loitsut"
 
 #: src/gui/popupmenu.cpp:505
 msgid "Load old spells"
-msgstr ""
+msgstr "Lataa vanhat loitsut"
 
 #: src/gui/popupmenu.cpp:506
 msgid "Edit spell"
-msgstr ""
+msgstr "Muokkaa loitsua"
 
 #: src/gui/popupmenu.cpp:532
 msgid "Disable highlight"
@@ -1524,20 +1524,20 @@ msgstr "Näytä"
 
 #: src/gui/popupmenu.cpp:1746
 msgid "Reset yellow bar"
-msgstr ""
+msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
 #: src/gui/popupmenu.cpp:1764 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 msgid "(default)"
-msgstr ""
+msgstr "(oletus)"
 
 #: src/gui/popupmenu.cpp:1776 src/gui/popupmenu.cpp:1794
 msgid "Move up"
-msgstr ""
+msgstr "Siirrä ylös"
 
 #: src/gui/popupmenu.cpp:1781 src/gui/popupmenu.cpp:1799
 msgid "Move down"
-msgstr ""
+msgstr "Siirrä alas"
 
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
@@ -1562,7 +1562,7 @@ msgstr "Sähköpostiosoite:"
 #: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be at least %d characters long."
-msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä"
+msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä."
 
 #: src/gui/register.cpp:182
 #, c-format
@@ -1572,7 +1572,7 @@ msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä."
 #: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:119
 #, c-format
 msgid "The password needs to be at least %d characters long."
-msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
+msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä."
 
 #: src/gui/register.cpp:198 src/gui/unregisterdialog.cpp:126
 #, c-format
@@ -1957,7 +1957,7 @@ msgstr "Näytä parannellut minikartat"
 
 #: src/gui/setup_other.cpp:192
 msgid "Enable attack filter"
-msgstr ""
+msgstr "Ota käyttöön hyökkäyssuodin"
 
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
@@ -1983,46 +1983,50 @@ msgstr "Huomiotta jätetty"
 msgid "Erased"
 msgstr "Pyyhitty"
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Salli kaupakäynti"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Salli kuiskaukset"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr "Vanha"
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr "Laita kaikki kuiskaukset välilehtiin"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 msgid "Show gender"
 msgstr "Näytä sukupuoli"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Pelaajat"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Kun jätät huomiotta:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 msgid "Show level"
 msgstr "Näytä taso"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 msgid "Show own name"
 msgstr "Näytä oma nimi"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 msgid "Target dead players"
 msgstr "Ota kuolleetkin pelaajat kohteiksi"
 
+#: src/gui/setup_players.cpp:316
+msgid "Secure trades"
+msgstr "Turvaa kaupat"
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr "Teema"
@@ -2302,7 +2306,7 @@ msgid "Sell items"
 msgstr "Myy tavaroita"
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Lisää"
 
@@ -2427,19 +2431,19 @@ msgstr "Nav"
 
 #: src/gui/socialwindow.cpp:783
 msgid "Atk"
-msgstr ""
+msgstr "Hyö"
 
 #: src/gui/socialwindow.cpp:824
 msgid "Priority mobs"
-msgstr ""
+msgstr "Priorisoidut kohteet"
 
 #: src/gui/socialwindow.cpp:856
 msgid "Attack mobs"
-msgstr ""
+msgstr "Hyökkäyskohteet"
 
 #: src/gui/socialwindow.cpp:891
 msgid "Ignore mobs"
-msgstr ""
+msgstr "Ohitettavat kohteet"
 
 #: src/gui/socialwindow.cpp:954
 msgid "Create Guild"
@@ -3050,45 +3054,45 @@ msgstr "Koulukunnan taso:"
 msgid "Save"
 msgstr "Tallenna"
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Ehdota vaihtokauppaa"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Varmistettu. Odotetaan..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Hyväksy kauppa"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Hyväksytty. Odotetaan..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Kauppa: Sinä"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr "Saat %s"
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Annat:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Muuta"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
@@ -3241,15 +3245,15 @@ msgstr "Siirtymän korostus"
 
 #: src/gui/userpalette.cpp:149
 msgid "Default collision Highlight"
-msgstr ""
+msgstr "Oletustörmäyskorostus"
 
 #: src/gui/userpalette.cpp:151
 msgid "Air collision Highlight"
-msgstr ""
+msgstr "Ilmatörmäyksen korostus"
 
 #: src/gui/userpalette.cpp:153
 msgid "Water collision Highlight"
-msgstr ""
+msgstr "Vesitörmäyksen korostus"
 
 #: src/gui/userpalette.cpp:155
 msgid "Walkable Highlight"
@@ -3462,7 +3466,7 @@ msgstr "TT"
 
 #: src/gui/windowmenu.cpp:68
 msgid "Smilies"
-msgstr ""
+msgstr "Hymiöt"
 
 #: src/gui/windowmenu.cpp:70
 msgid "STA"
@@ -3506,11 +3510,11 @@ msgstr "Lo"
 
 #: src/gui/windowmenu.cpp:94
 msgid "DR"
-msgstr ""
+msgstr "Pu"
 
 #: src/gui/windowmenu.cpp:95
 msgid "SET"
-msgstr ""
+msgstr "Ase"
 
 #: src/gui/worldselectdialog.cpp:75
 msgid "Select World"
@@ -3530,7 +3534,7 @@ msgstr "Varasto"
 
 #: src/inventory.cpp:242
 msgid "Cart"
-msgstr ""
+msgstr "Kärry"
 
 #: src/keyboardconfig.cpp:41
 msgid "Move Up"
@@ -3554,23 +3558,23 @@ msgstr "Kohdista ja hyökkää"
 
 #: src/keyboardconfig.cpp:49
 msgid "Move to Target"
-msgstr ""
+msgstr "Mene kohteen luo"
 
 #: src/keyboardconfig.cpp:51
 msgid "Change Move to Target type"
-msgstr ""
+msgstr "Muuta kohteen luo liikkumisen tyyppiä"
 
 #: src/keyboardconfig.cpp:53
 msgid "Move to Home location"
-msgstr ""
+msgstr "Siirry kotipaikkaan"
 
 #: src/keyboardconfig.cpp:55
 msgid "Set home location"
-msgstr ""
+msgstr "Aseta kotipaikka"
 
 #: src/keyboardconfig.cpp:57
 msgid "Move to navigation point"
-msgstr ""
+msgstr "Siirry reittipisteeseen"
 
 #: src/keyboardconfig.cpp:59
 msgid "Smilie"
@@ -3582,15 +3586,15 @@ msgstr "Keskeytä hyökkäys"
 
 #: src/keyboardconfig.cpp:62
 msgid "Target Closest"
-msgstr ""
+msgstr "Lähin kohteeksi"
 
 #: src/keyboardconfig.cpp:64
 msgid "Target NPC"
-msgstr "Kohdista ei-pelaajahahmoon"
+msgstr "NPC kohteeksi"
 
 #: src/keyboardconfig.cpp:65
 msgid "Target Player"
-msgstr "Kohdista pelaajaan"
+msgstr "Pelaaja kohteeksi"
 
 #: src/keyboardconfig.cpp:67
 msgid "Pickup"
@@ -3598,7 +3602,7 @@ msgstr "Nouki"
 
 #: src/keyboardconfig.cpp:68
 msgid "Change Pickup Type"
-msgstr ""
+msgstr "Muuta noston tyyppiä"
 
 #: src/keyboardconfig.cpp:70
 msgid "Hide Windows"
@@ -3618,11 +3622,11 @@ msgstr "Salli/estä kaupankäynti"
 
 #: src/keyboardconfig.cpp:76
 msgid "Change Map View Mode"
-msgstr ""
+msgstr "Vaihda karttanäkymää"
 
 #: src/keyboardconfig.cpp:78
 msgid "Item Shortcuts Key"
-msgstr ""
+msgstr "Tavaroiden pikavalintanäppäin"
 
 #: src/keyboardconfig.cpp:80 src/keyboardconfig.cpp:82
 #: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:86
@@ -3693,35 +3697,35 @@ msgstr "Asukokonaisuusikkuna"
 
 #: src/keyboardconfig.cpp:144
 msgid "Shop Window"
-msgstr ""
+msgstr "Kauppaikkuna"
 
 #: src/keyboardconfig.cpp:145
 msgid "Quick drop Window"
-msgstr ""
+msgstr "Pikapudotusikkuna"
 
 #: src/keyboardconfig.cpp:147
-msgid "Kills Stats Window"
-msgstr ""
+msgid "Kill Stats Window"
+msgstr "Tappotilastoikkuna"
 
 #: src/keyboardconfig.cpp:149
 msgid "Commands Window"
-msgstr ""
+msgstr "Komentoikkuna"
 
 #: src/keyboardconfig.cpp:151
 msgid "Bot Checker Window"
-msgstr ""
+msgstr "Bottitutkaikkuna"
 
 #: src/keyboardconfig.cpp:154
 msgid "Who Is Online Window"
-msgstr ""
+msgstr "Kuka on linjoilla -ikkuna"
 
 #: src/keyboardconfig.cpp:156
 msgid "Previous Social Tab"
-msgstr ""
+msgstr "Edellinen sos. välilehti"
 
 #: src/keyboardconfig.cpp:157
 msgid "Next Social Tab"
-msgstr ""
+msgstr "Seuraava sos. välilehti"
 
 #: src/keyboardconfig.cpp:159 src/keyboardconfig.cpp:161
 #: src/keyboardconfig.cpp:163 src/keyboardconfig.cpp:165
@@ -3759,8 +3763,8 @@ msgid "Copy Outfit"
 msgstr "Kopioi asu"
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
-msgstr ""
+msgid "Copy equipped to Outfit"
+msgstr "Kopioi varusteet asuksi"
 
 #: src/keyboardconfig.cpp:258
 msgid "Toggle Chat"
@@ -3783,20 +3787,20 @@ msgid "Next Chat Tab"
 msgstr "Seuraava keskusteluvälilehti"
 
 #: src/keyboardconfig.cpp:268
-msgid "Previous chat tab line"
-msgstr ""
+msgid "Previous chat line"
+msgstr "Edellinen keskustelulinja"
 
 #: src/keyboardconfig.cpp:270
-msgid "Next chat tab line"
-msgstr ""
+msgid "Next chat line"
+msgstr "Seuraava keskustelulinja"
 
 #: src/keyboardconfig.cpp:272
 msgid "Chat Auto Complete"
-msgstr ""
+msgstr "Sarkaintäydennys keskustelussa"
 
 #: src/keyboardconfig.cpp:274
 msgid "Deactivate Chat Input"
-msgstr ""
+msgstr "Poistu keskustelusyötöstä"
 
 #: src/keyboardconfig.cpp:276
 msgid "Select OK"
@@ -3812,19 +3816,19 @@ msgstr "Jätä huomiotta syöte 2"
 
 #: src/keyboardconfig.cpp:282
 msgid "Direct Up"
-msgstr ""
+msgstr "Vie ylös"
 
 #: src/keyboardconfig.cpp:283
 msgid "Direct Down"
-msgstr ""
+msgstr "Vie alas"
 
 #: src/keyboardconfig.cpp:285
 msgid "Direct Left"
-msgstr ""
+msgstr "Vie vasemmalle"
 
 #: src/keyboardconfig.cpp:286
 msgid "Direct Right"
-msgstr ""
+msgstr "Vie oikealle"
 
 #: src/keyboardconfig.cpp:288
 msgid "Crazy moves"
@@ -3836,71 +3840,71 @@ msgstr "Muuta villiliiketilaa"
 
 #: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items from 0 slot"
-msgstr ""
+msgstr "Pudota nopeasti N esinettä paikasta 0"
 
 #: src/keyboardconfig.cpp:294
 msgid "Quick Drop N Items"
-msgstr ""
+msgstr "Pudota nopeasti N esinettä"
 
 #: src/keyboardconfig.cpp:296
 msgid "Switch Quick Drop Counter"
-msgstr ""
+msgstr "Vaihda nopean pudotuksen laskuria"
 
 #: src/keyboardconfig.cpp:298
 msgid "Quick heal target or self"
-msgstr ""
+msgstr "Pikaparanna kohde tai itse"
 
 #: src/keyboardconfig.cpp:300
 msgid "Use #itenplz spell"
-msgstr ""
+msgstr "Käytä #itenplz-loitsua"
 
 #: src/keyboardconfig.cpp:302
 msgid "Use magic attack"
-msgstr ""
+msgstr "Käytä magiahyökkäystä"
 
 #: src/keyboardconfig.cpp:304
 msgid "Switch magic attack"
-msgstr ""
+msgstr "Vaihda magiahyökkäystä"
 
 #: src/keyboardconfig.cpp:306
 msgid "Change move type"
-msgstr ""
+msgstr "Vaihda liikkumistyyppiä"
 
 #: src/keyboardconfig.cpp:308
 msgid "Change Attack Weapon Type"
-msgstr ""
+msgstr "Vaihda hyökkäysaseen tyyppiä"
 
 #: src/keyboardconfig.cpp:310
 msgid "Change Attack Type"
-msgstr ""
+msgstr "Vaihda hyökkäystyyppiä"
 
 #: src/keyboardconfig.cpp:312
 msgid "Change Follow mode"
-msgstr ""
+msgstr "Vaihda seuraustyyliä"
 
 #: src/keyboardconfig.cpp:314
 msgid "Change Imitation mode"
-msgstr ""
+msgstr "Vaihda matkintatyyliä"
 
 #: src/keyboardconfig.cpp:317
 msgid "Disable / Enable Game modifier keys"
-msgstr ""
+msgstr "Ota käyttöön / poista pelimuokkaimet"
 
 #: src/keyboardconfig.cpp:318
 msgid "On / Off audio"
-msgstr ""
+msgstr "Äänet päälle / pois"
 
 #: src/keyboardconfig.cpp:320
 msgid "Enable / Disable away mode"
-msgstr ""
+msgstr "Aseta / peru poissaolo"
 
 #: src/keyboardconfig.cpp:322
 msgid "Emulate right click from keyboard"
-msgstr ""
+msgstr "Kontekstivalikkoon \"klikkaus\" näppäimistöltä"
 
 #: src/keyboardconfig.cpp:324
 msgid "Toggle camera mode"
-msgstr ""
+msgstr "Vaihda kameran toimintaa"
 
 #: src/keyboardconfig.cpp:397
 #, c-format
@@ -3913,35 +3917,35 @@ msgstr ""
 
 #: src/localplayer.cpp:344
 msgid "You were killed by "
-msgstr ""
+msgstr "Sinut otti hengiltä "
 
 #: src/localplayer.cpp:1379
 msgid "Tried to pick up nonexistent item."
-msgstr ""
+msgstr "Yritit nostaa olemattoman tavaran."
 
 #: src/localplayer.cpp:1381
 msgid "Item is too heavy."
-msgstr ""
+msgstr "Tavara on liian painava."
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
-msgstr ""
+msgid "Item is too far away."
+msgstr "Tavara on liian kaukana."
 
 #: src/localplayer.cpp:1385
 msgid "Inventory is full."
-msgstr ""
+msgstr "Sinulla on liikaa tavaraa ennestään."
 
 #: src/localplayer.cpp:1387
 msgid "Stack is too big."
-msgstr ""
+msgstr "Kasa on liian suuri."
 
 #: src/localplayer.cpp:1390
 msgid "Item belongs to someone else."
-msgstr ""
+msgstr "Tavara kuuluu jollekulle muulle."
 
 #: src/localplayer.cpp:1393
 msgid "Unknown problem picking up item."
-msgstr ""
+msgstr "Tuntematon ongelma esti tavaran nostamisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
@@ -3958,39 +3962,39 @@ msgstr "Poissa"
 
 #: src/localplayer.cpp:3450
 msgid "Follow: "
-msgstr ""
+msgstr "Seuraa: "
 
 #: src/localplayer.cpp:3452 src/localplayer.cpp:3467
 msgid "Follow canceled"
-msgstr ""
+msgstr "Seuraaminen keskeytetty"
 
 #: src/localplayer.cpp:3459
 msgid "Imitation: "
-msgstr ""
+msgstr "Matki: "
 
 #: src/localplayer.cpp:3461 src/localplayer.cpp:3469
 msgid "Imitation canceled"
-msgstr ""
+msgstr "Matkiminen keskeytetty"
 
 #: src/localplayer.cpp:3821
 msgid "You see "
-msgstr ""
+msgstr "Näet "
 
 #: src/main.cpp:45
 msgid "manaplus [options] [mana-file]"
-msgstr ""
+msgstr "manaplus [parametrit] [.mana-tiedosto]"
 
 #: src/main.cpp:46
 msgid "[mana-file] : The mana file is an XML file (.mana)"
-msgstr ""
+msgstr "[.mana-tiedosto] : Manatiedosto on XML-tiedosto (.mana)"
 
 #: src/main.cpp:47
 msgid "              used to set custom parameters"
-msgstr ""
+msgstr "              käytetään lisäasetusten antamiseen"
 
 #: src/main.cpp:48
 msgid "              to the manaplus client."
-msgstr ""
+msgstr "              manaplus-sovellukselle."
 
 #: src/main.cpp:50
 msgid "Options:"
@@ -3998,11 +4002,11 @@ msgstr "Parametrit:"
 
 #: src/main.cpp:51
 msgid "  -l --log-file       : Log file to use"
-msgstr ""
+msgstr "  -l --log-file       : Käytettävä lokitiedosto"
 
 #: src/main.cpp:52
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr ""
+msgstr "  -L --chat-log-dir   : Käytettävä keskustelulokihakemisto"
 
 #: src/main.cpp:53
 msgid "  -v --version        : Display the version"
@@ -4063,7 +4067,7 @@ msgstr "     --screenshot-dir : Kuvankaappausten tallennushakemisto"
 
 #: src/main.cpp:70
 msgid "     --safemode       : Start game in safe mode"
-msgstr ""
+msgstr "     --safemode       : Käynnistä peli vikasietotilassa"
 
 #: src/main.cpp:72
 msgid "     --no-opengl      : Disable OpenGL for this session"
@@ -4071,7 +4075,7 @@ 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ää"
+msgstr "Ei mitään myytävää."
 
 #: src/net/ea/buysellhandler.cpp:169
 msgid "Thanks for buying."
@@ -4088,7 +4092,7 @@ msgstr "Voima"
 #: src/net/manaserv/attributes.cpp:167
 #, c-format
 msgid "Strength %+.1f"
-msgstr ""
+msgstr "Voima %+.1f"
 
 #: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:249
 msgid "Agility"
@@ -4097,7 +4101,7 @@ msgstr "Ketteryys"
 #: src/net/manaserv/attributes.cpp:180
 #, c-format
 msgid "Agility %+.1f"
-msgstr ""
+msgstr "Ketteryys %+.1f"
 
 #: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:252
 msgid "Dexterity"
@@ -4106,7 +4110,7 @@ msgstr "Näppäryys"
 #: src/net/manaserv/attributes.cpp:193
 #, c-format
 msgid "Dexterity %+.1f"
-msgstr ""
+msgstr "Näppäryys %+.1f"
 
 #: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:250
 msgid "Vitality"
@@ -4115,7 +4119,7 @@ msgstr "Elinvoima"
 #: src/net/manaserv/attributes.cpp:206
 #, c-format
 msgid "Vitality %+.1f"
-msgstr ""
+msgstr "Elinvoima %+.1f"
 
 #: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:251
 msgid "Intelligence"
@@ -4124,7 +4128,7 @@ msgstr "Älykkyys"
 #: src/net/manaserv/attributes.cpp:219
 #, c-format
 msgid "Intelligence %+.1f"
-msgstr ""
+msgstr "Älykkyys %+.1f"
 
 #: src/net/manaserv/attributes.cpp:225
 msgid "Willpower"
@@ -4133,7 +4137,7 @@ msgstr "Tahdonvoima"
 #: src/net/manaserv/attributes.cpp:232
 #, c-format
 msgid "Willpower %+.1f"
-msgstr ""
+msgstr "Tahdonvoima %+.1f"
 
 #: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:101
 msgid "You are dead."
@@ -4242,12 +4246,12 @@ msgstr "Hahmon arvot ovat liian matalat. (Lurjus.)"
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
-msgstr ""
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr "Ainakin yksi arvo on sallitun alueen (%u - %u) ulkopuolella."
 
 #: src/net/manaserv/charhandler.cpp:178
 msgid "Invalid slot number."
-msgstr ""
+msgstr "Paikan numero ei kelpaa."
 
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
@@ -4478,11 +4482,11 @@ msgstr "Myyminen epäonnistui."
 
 #: src/net/tmwa/buysellhandler.cpp:136
 msgid "Unable to sell while trading."
-msgstr ""
+msgstr "Kaupankäynnin aikana ei voi myydä kaupasta."
 
 #: src/net/tmwa/buysellhandler.cpp:139
 msgid "Unable to sell unsellable item."
-msgstr ""
+msgstr "Myyntikelvotonta tavaraa ei voi myydä."
 
 #: src/net/tmwa/charserverhandler.cpp:119
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -4503,19 +4507,19 @@ msgstr ""
 
 #: src/net/tmwa/charserverhandler.cpp:176 src/net/tmwa/loginhandler.cpp:194
 msgid "Wrong name."
-msgstr ""
+msgstr "Väärä nimi."
 
 #: src/net/tmwa/charserverhandler.cpp:179
 msgid "Incorrect stats."
-msgstr ""
+msgstr "Väärät arvot."
 
 #: src/net/tmwa/charserverhandler.cpp:182
 msgid "Incorrect hair."
-msgstr ""
+msgstr "Väärä hiustyyli."
 
 #: src/net/tmwa/charserverhandler.cpp:185
 msgid "Incorrect slot."
-msgstr ""
+msgstr "Väärä paikka."
 
 #: src/net/tmwa/charserverhandler.cpp:199
 msgid "Character deleted."
@@ -4552,12 +4556,12 @@ msgstr "Tuuri:"
 #: src/net/tmwa/chathandler.cpp:104
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
-msgstr ""
+msgstr "Kuiskausta ei voitu lähettää, %s ei ole kirjautuneena sisään."
 
 #: src/net/tmwa/chathandler.cpp:112
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
-msgstr ""
+msgstr "Kuiskausta ei voitu lähettää, %s ei huomioinut sitä."
 
 #: src/net/tmwa/chathandler.cpp:336
 msgid "MVP player."
@@ -4565,7 +4569,7 @@ msgstr "MVP-pelaaja."
 
 #: src/net/tmwa/chathandler.cpp:340
 msgid "MVP player: "
-msgstr ""
+msgstr "MVP-pelaaja: "
 
 #: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
 #: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
@@ -4722,61 +4726,61 @@ msgid "This command causes the player to leave the guild."
 msgstr "Tämä komento saa sinut eroamaan killasta."
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
-msgid "You already in guild."
-msgstr ""
+msgid "You are already in guild."
+msgstr "Olet jo killassa."
 
 #: src/net/tmwa/guildhandler.cpp:120
 msgid "Emperium check failed."
-msgstr ""
+msgstr "Emperium-tarkistus epäonnistui."
 
 #: src/net/tmwa/guildhandler.cpp:125
 msgid "Unknown server response."
-msgstr ""
+msgstr "Tuntematon palvelimen vastaus."
 
 #: src/net/tmwa/guildhandler.cpp:203
 #, c-format
 msgid "Guild name: %s"
-msgstr ""
+msgstr "Killan nimi: %s"
 
 #: src/net/tmwa/guildhandler.cpp:205
 #, c-format
 msgid "Guild master: %s"
-msgstr ""
+msgstr "Kiltamestari: %s"
 
 #: src/net/tmwa/guildhandler.cpp:207
 #, c-format
 msgid "Guild level: %d"
-msgstr ""
+msgstr "Kiltataso: %d"
 
 #: src/net/tmwa/guildhandler.cpp:209
 #, c-format
 msgid "Online members: %d"
-msgstr ""
+msgstr "Jäseniä linjoilla: %d"
 
 #: src/net/tmwa/guildhandler.cpp:211
 #, c-format
 msgid "Max members: %d"
-msgstr ""
+msgstr "Jäsenmaksimi: %d"
 
 #: src/net/tmwa/guildhandler.cpp:213
 #, c-format
 msgid "Average level: %d"
-msgstr ""
+msgstr "Keskim. taso: %d"
 
 #: src/net/tmwa/guildhandler.cpp:215
 #, c-format
 msgid "Guild exp: %d"
-msgstr ""
+msgstr "Kiltakokemusta: %d kkp"
 
 #: src/net/tmwa/guildhandler.cpp:217
 #, c-format
 msgid "Guild next exp: %d"
-msgstr ""
+msgstr "Seuraavaan tasoon: %d kkp"
 
 #: src/net/tmwa/guildhandler.cpp:219
 #, c-format
 msgid "Guild castle: %s"
-msgstr ""
+msgstr "Killan linna: %s"
 
 #: src/net/tmwa/guildhandler.cpp:434
 msgid "Could not inivte user to guild."
@@ -4800,21 +4804,21 @@ msgstr "Tuntematon vastaus kiltakutsuun."
 
 #: src/net/tmwa/guildhandler.cpp:476
 msgid "You have left the guild."
-msgstr ""
+msgstr "Olet eronnut killasta."
 
 #: src/net/tmwa/guildhandler.cpp:490
 #, c-format
 msgid "%s has left your guild."
-msgstr ""
+msgstr "%s on eronnut killastasi."
 
 #: src/net/tmwa/guildhandler.cpp:522
 msgid "You was kicked from guild."
-msgstr ""
+msgstr "Sinut on potkittu killasta."
 
 #: src/net/tmwa/guildhandler.cpp:536
 #, c-format
 msgid "%s has kicked from your guild."
-msgstr ""
+msgstr "%s on potkittu ulos killastasi."
 
 #: src/net/tmwa/gui/partytab.cpp:68
 msgid "/invite > Invite a player to your party"
@@ -5011,7 +5015,7 @@ msgstr "Ryhmä luotu."
 #: src/net/tmwa/partyhandler.cpp:141
 #, c-format
 msgid "%s has joined your party."
-msgstr ""
+msgstr "%s on liittynyt ryhmääsi."
 
 #: src/net/tmwa/partyhandler.cpp:177
 #, c-format
@@ -5031,7 +5035,7 @@ msgstr "%s on nyt ryhmäsi jäsen."
 #: src/net/tmwa/partyhandler.cpp:192
 #, c-format
 msgid "%s can't join your party because party is full."
-msgstr ""
+msgstr "%s ei voi liittyä ryhmääsi, koska se on täynnä."
 
 #: src/net/tmwa/partyhandler.cpp:197
 #, c-format
@@ -5131,7 +5135,7 @@ msgstr ""
 
 #: src/net/tmwa/playerhandler.cpp:351
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr ""
+msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
 
 #: src/net/tmwa/playerhandler.cpp:456
 #, c-format
@@ -5268,7 +5272,7 @@ msgstr "Tavaran lisääminen epäonnistui; kauppakumppanilla ei ole tilaa sille.
 
 #: src/net/tmwa/tradehandler.cpp:258
 msgid "Failed adding item. You can't trade this item."
-msgstr ""
+msgstr "Tavaran lisääminen epäonnistui. Et voi kaupitella sitä."
 
 #: src/net/tmwa/tradehandler.cpp:262
 msgid "Failed adding item for unknown reason."
diff --git a/po/fr.po b/po/fr.po
index bfec16548..cb94a68e1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
-"PO-Revision-Date: 2011-05-22 14:06+0000\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
+"PO-Revision-Date: 2011-05-22 17:25+0000\n"
 "Last-Translator: Jumpy <antoinebcn@hotmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -612,7 +612,7 @@ msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
-#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Supprimer"
@@ -864,7 +864,7 @@ msgstr "Sortie : %d bytes/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:48
-#: src/gui/tradewindow.cpp:82 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "Ok"
 
@@ -1262,7 +1262,7 @@ msgid "Away outfit"
 msgstr "Équipement en absence"
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Échange"
@@ -1983,46 +1983,50 @@ msgstr "Ignoré"
 msgid "Erased"
 msgstr "Effacé"
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Autoriser les échanges"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Autoriser les messages privés"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr "Ancien"
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr "Placer tous les messages privés dans des onglets"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 msgid "Show gender"
 msgstr "Afficher le genre"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Joueurs"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Quand ignoré :"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 msgid "Show level"
 msgstr "Afficher le niveau"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 msgid "Show own name"
 msgstr "Afficher son propre nom"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 msgid "Target dead players"
 msgstr "Cibler les joueurs morts"
 
+#: src/gui/setup_players.cpp:316
+msgid "Secure trades"
+msgstr "Protection des échanges"
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr "Thème"
@@ -2308,7 +2312,7 @@ msgid "Sell items"
 msgstr "Vendre des objets"
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Ajouter"
 
@@ -3060,47 +3064,47 @@ msgstr "Niveau scolaire : "
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Proposer un troc"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Confirmé. En attente..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Accepter l'échange"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Accepté. En attente..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Échange : Vous"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr "Vous recevez %s"
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Vous donnez :"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Changer"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
 "dans cette fenêtre."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Vous n'avez pas assez d'argent."
 
@@ -3717,7 +3721,7 @@ msgid "Quick drop Window"
 msgstr "Fenêtre pour jeter les items"
 
 #: src/keyboardconfig.cpp:147
-msgid "Kills Stats Window"
+msgid "Kill Stats Window"
 msgstr "Fenêtre de statistiques"
 
 #: src/keyboardconfig.cpp:149
@@ -3776,8 +3780,8 @@ msgid "Copy Outfit"
 msgstr "Copier la tenue"
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
-msgstr "Copier les équipements dans la fenêtre d'équipement rapide"
+msgid "Copy equipped to Outfit"
+msgstr "Copier l'équipement porté dans les tenues"
 
 #: src/keyboardconfig.cpp:258
 msgid "Toggle Chat"
@@ -3800,12 +3804,12 @@ msgid "Next Chat Tab"
 msgstr "Onglet de conversation suivant"
 
 #: src/keyboardconfig.cpp:268
-msgid "Previous chat tab line"
-msgstr "Dialogue : ligne précédente "
+msgid "Previous chat line"
+msgstr "Ligne de conversation précédente"
 
 #: src/keyboardconfig.cpp:270
-msgid "Next chat tab line"
-msgstr "Dialogue : ligne suivante"
+msgid "Next chat line"
+msgstr "Ligne de conversation suivante"
 
 #: src/keyboardconfig.cpp:272
 msgid "Chat Auto Complete"
@@ -3941,8 +3945,8 @@ msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
-msgstr "L'item est trop loin"
+msgid "Item is too far away."
+msgstr "L'objet est trop éloigné"
 
 #: src/localplayer.cpp:1385
 msgid "Inventory is full."
@@ -4270,8 +4274,10 @@ msgstr "Les caractéristiques du personnage sont trop basses."
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
-msgstr "Une stats au moins est en dehors des montants autorisés : (%u - %u)."
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
+"Au moins une des caractéristiques est en dehors des limites autorisés : (%u "
+"- %u)."
 
 #: src/net/manaserv/charhandler.cpp:178
 msgid "Invalid slot number."
@@ -4753,8 +4759,8 @@ msgid "This command causes the player to leave the guild."
 msgstr "Cette commande vous fait quitter la guilde actuelle."
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
-msgid "You already in guild."
-msgstr "Vous êtes déjà dans une guilde."
+msgid "You are already in guild."
+msgstr "Vous faîtes déjà membre d'une guilde."
 
 #: src/net/tmwa/guildhandler.cpp:120
 msgid "Emperium check failed."
diff --git a/po/hr.po b/po/hr.po
index c074d4383..b8b5e1477 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
 "PO-Revision-Date: 2009-12-13 09:30+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -653,7 +653,7 @@ msgid "Enter password:"
 msgstr "Pogrešna lozinka"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
-#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Obriši"
@@ -932,7 +932,7 @@ msgstr ""
 
 #: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: 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
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "U redu"
 
@@ -1351,7 +1351,7 @@ msgid "Away outfit"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Trgovanje"
@@ -2141,50 +2141,55 @@ msgstr "Ignorirano"
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Dozvoli trgovanje"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Dozvoli šapate"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr "Stavi sve šapate u kartice"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 #, fuzzy
 msgid "Show gender"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Igrači"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Kad ignorira:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 #, fuzzy
 msgid "Show level"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 #, fuzzy
 msgid "Show own name"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 #, fuzzy
 msgid "Target dead players"
 msgstr "Ciljaj Igrača"
 
+#: src/gui/setup_players.cpp:316
+#, fuzzy
+msgid "Secure trades"
+msgstr "Složi se za trgovanje"
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr ""
@@ -2482,7 +2487,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Dodaj"
 
@@ -3263,44 +3268,44 @@ msgstr "Prikaži ime"
 msgid "Save"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Predloži razmjenu"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Potvrđeno. Čekanje..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Složi se za trgovanje"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Dogovoreno. Čekanje..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Trgovanje: Vi"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Vi dobijete %s."
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Daješ:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Izmijeni"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Nemate dovoljno novca."
 
@@ -3946,7 +3951,7 @@ msgstr "Skrij Prozore"
 
 #: src/keyboardconfig.cpp:147
 #, fuzzy
-msgid "Kills Stats Window"
+msgid "Kill Stats Window"
 msgstr "Prozor Statusa"
 
 #: src/keyboardconfig.cpp:149
@@ -4009,7 +4014,7 @@ msgid "Copy Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
+msgid "Copy equipped to Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:258
@@ -4034,12 +4039,12 @@ msgstr "Sljedeća Chat Kartica"
 
 #: src/keyboardconfig.cpp:268
 #, fuzzy
-msgid "Previous chat tab line"
+msgid "Previous chat line"
 msgstr "Prethodna Chat Kartica"
 
 #: src/keyboardconfig.cpp:270
 #, fuzzy
-msgid "Next chat tab line"
+msgid "Next chat line"
 msgstr "Sljedeća Chat Kartica"
 
 #: src/keyboardconfig.cpp:272
@@ -4184,7 +4189,7 @@ msgid "Item is too heavy."
 msgstr ""
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
+msgid "Item is too far away."
 msgstr ""
 
 #: src/localplayer.cpp:1385
@@ -4526,7 +4531,7 @@ msgstr "Podaci lika su u redu"
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
@@ -5053,7 +5058,7 @@ msgstr "Ova naredba postavlja temu za <message>."
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
 #, fuzzy
-msgid "You already in guild."
+msgid "You are already in guild."
 msgstr "Pogreška pri ustanovljavanju ceha."
 
 #: src/net/tmwa/guildhandler.cpp:120
diff --git a/po/hu.po b/po/hu.po
index 846f6ff35..059573f75 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
 "PO-Revision-Date: 2009-07-07 19:52+0000\n"
 "Last-Translator: Tatsukichi <artit91@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -648,7 +648,7 @@ msgid "Enter password:"
 msgstr "Hibás jelszó"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
-#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Törlés"
@@ -928,7 +928,7 @@ msgstr ""
 
 #: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: 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
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "Ok"
 
@@ -1347,7 +1347,7 @@ msgid "Away outfit"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Üzlet"
@@ -2137,50 +2137,55 @@ msgstr "Tiltott"
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Üzletelés engedélyezése"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Privát engedélyezése"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr "Privátok fülekbe tétele"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 #, fuzzy
 msgid "Show gender"
 msgstr "A név mutatása"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Játékosok"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Ha ignorolva van:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 #, fuzzy
 msgid "Show level"
 msgstr "A név mutatása"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 #, fuzzy
 msgid "Show own name"
 msgstr "A név mutatása"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 #, fuzzy
 msgid "Target dead players"
 msgstr "Játékost Kijelöl"
 
+#: src/gui/setup_players.cpp:316
+#, fuzzy
+msgid "Secure trades"
+msgstr "Üzlet elfogadása"
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr ""
@@ -2480,7 +2485,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Hozzáad"
 
@@ -3261,45 +3266,45 @@ msgstr "A név mutatása"
 msgid "Save"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Üzletet javasol"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Megerősítve. Vár..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Üzlet elfogadása"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Elfogadva. Vár..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Üzlet: Te"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Kapott tárgy: %s."
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Adott tárgyak:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Változtatás"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Nincs elég pénzed."
 
@@ -3948,7 +3953,7 @@ msgstr "Ablakok Elrejtése"
 
 #: src/keyboardconfig.cpp:147
 #, fuzzy
-msgid "Kills Stats Window"
+msgid "Kill Stats Window"
 msgstr "Sztátusz Ablak"
 
 #: src/keyboardconfig.cpp:149
@@ -4011,7 +4016,7 @@ msgid "Copy Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
+msgid "Copy equipped to Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:258
@@ -4036,12 +4041,12 @@ msgstr "Következő Chat Fül"
 
 #: src/keyboardconfig.cpp:268
 #, fuzzy
-msgid "Previous chat tab line"
+msgid "Previous chat line"
 msgstr "Előző Chat Fül"
 
 #: src/keyboardconfig.cpp:270
 #, fuzzy
-msgid "Next chat tab line"
+msgid "Next chat line"
 msgstr "Következő Chat Fül"
 
 #: src/keyboardconfig.cpp:272
@@ -4186,7 +4191,7 @@ msgid "Item is too heavy."
 msgstr ""
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
+msgid "Item is too far away."
 msgstr ""
 
 #: src/localplayer.cpp:1385
@@ -4533,7 +4538,7 @@ msgstr "Karakter statok rendben"
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
@@ -5060,7 +5065,7 @@ msgstr "Ezzel a paranccsal a játékos elhagyja a csapatát."
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
 #, fuzzy
-msgid "You already in guild."
+msgid "You are already in guild."
 msgstr "Hiba a klán létrehozása közben."
 
 #: src/net/tmwa/guildhandler.cpp:120
diff --git a/po/it.po b/po/it.po
index 21c3fb051..449e5830f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
 "PO-Revision-Date: 2011-04-15 17:33+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Italian <>\n"
@@ -616,7 +616,7 @@ msgid "Enter password:"
 msgstr "Password:"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
-#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Elimina"
@@ -874,7 +874,7 @@ msgstr "Out: %d bytes/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:48
-#: src/gui/tradewindow.cpp:82 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "OK"
 
@@ -1272,7 +1272,7 @@ msgid "Away outfit"
 msgstr "Away outfit"
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Commercia"
@@ -2009,46 +2009,51 @@ msgstr "Ignorato"
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Permetti scambi"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Permetti sussurri"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr "Sposta tutti i sussurri in schede"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Giocatori"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Quando si ignora:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 msgid "Target dead players"
 msgstr ""
 
+#: src/gui/setup_players.cpp:316
+#, fuzzy
+msgid "Secure trades"
+msgstr "Accetta scambio"
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr ""
@@ -2326,7 +2331,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -3077,46 +3082,46 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Inizia uno scambio"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Confermato. In attesa..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Accetta scambio"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Accettato. In attesa..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Commercia: Tu"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Dai:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Cambia"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
 "finestra."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Non hai abbastanza denaro."
 
@@ -3724,8 +3729,9 @@ msgid "Quick drop Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:147
-msgid "Kills Stats Window"
-msgstr ""
+#, fuzzy
+msgid "Kill Stats Window"
+msgstr "Finestra degli Status"
 
 #: src/keyboardconfig.cpp:149
 msgid "Commands Window"
@@ -3783,7 +3789,7 @@ msgid "Copy Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
+msgid "Copy equipped to Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:258
@@ -3807,12 +3813,14 @@ msgid "Next Chat Tab"
 msgstr "Scheda Chat Successiva"
 
 #: src/keyboardconfig.cpp:268
-msgid "Previous chat tab line"
-msgstr ""
+#, fuzzy
+msgid "Previous chat line"
+msgstr "Scheda Chat Precedente"
 
 #: src/keyboardconfig.cpp:270
-msgid "Next chat tab line"
-msgstr ""
+#, fuzzy
+msgid "Next chat line"
+msgstr "Scheda Chat Successiva"
 
 #: src/keyboardconfig.cpp:272
 msgid "Chat Auto Complete"
@@ -3946,7 +3954,7 @@ msgid "Item is too heavy."
 msgstr ""
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
+msgid "Item is too far away."
 msgstr ""
 
 #: src/localplayer.cpp:1385
@@ -4264,7 +4272,7 @@ msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
@@ -4741,8 +4749,9 @@ msgid "This command causes the player to leave the guild."
 msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
-msgid "You already in guild."
-msgstr ""
+#, fuzzy
+msgid "You are already in guild."
+msgstr "Errore durante la creazione della gilda."
 
 #: src/net/tmwa/guildhandler.cpp:120
 msgid "Emperium check failed."
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 0c2b3a942..5d9e72b81 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -608,7 +608,7 @@ 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/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr ""
@@ -860,7 +860,7 @@ msgstr ""
 
 #: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: 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
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr ""
 
@@ -1258,7 +1258,7 @@ msgid "Away outfit"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr ""
@@ -1978,46 +1978,50 @@ msgstr ""
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 msgid "Target dead players"
 msgstr ""
 
+#: src/gui/setup_players.cpp:316
+msgid "Secure trades"
+msgstr ""
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr ""
@@ -2295,7 +2299,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr ""
 
@@ -3043,44 +3047,44 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr ""
 
@@ -3686,7 +3690,7 @@ msgid "Quick drop Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:147
-msgid "Kills Stats Window"
+msgid "Kill Stats Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:149
@@ -3745,7 +3749,7 @@ msgid "Copy Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
+msgid "Copy equipped to Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:258
@@ -3769,11 +3773,11 @@ msgid "Next Chat Tab"
 msgstr ""
 
 #: src/keyboardconfig.cpp:268
-msgid "Previous chat tab line"
+msgid "Previous chat line"
 msgstr ""
 
 #: src/keyboardconfig.cpp:270
-msgid "Next chat tab line"
+msgid "Next chat line"
 msgstr ""
 
 #: src/keyboardconfig.cpp:272
@@ -3908,7 +3912,7 @@ msgid "Item is too heavy."
 msgstr ""
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
+msgid "Item is too far away."
 msgstr ""
 
 #: src/localplayer.cpp:1385
@@ -4221,7 +4225,7 @@ msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
@@ -4696,7 +4700,7 @@ msgid "This command causes the player to leave the guild."
 msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
-msgid "You already in guild."
+msgid "You are already in guild."
 msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:120
diff --git a/po/nl.po b/po/nl.po
index f527c7f4e..b8c342359 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
 "PO-Revision-Date: 2009-07-15 12:21+0000\n"
 "Last-Translator: Yentl <y.v.t@scarlet.be>\n"
 "Language-Team: Dutch\n"
@@ -647,7 +647,7 @@ msgid "Enter password:"
 msgstr "Onjuist wachtwoord"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
-#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Verwijderen"
@@ -927,7 +927,7 @@ msgstr ""
 
 #: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: 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
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "OK"
 
@@ -1346,7 +1346,7 @@ msgid "Away outfit"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Handel"
@@ -2133,50 +2133,55 @@ msgstr "Genegeerd"
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Handelen toestaan"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Fluisteren toestaan"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 #, fuzzy
 msgid "Show gender"
 msgstr "Naam tonen"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Spelers"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 #, fuzzy
 msgid "Show level"
 msgstr "Naam tonen"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 #, fuzzy
 msgid "Show own name"
 msgstr "Naam tonen"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 #, fuzzy
 msgid "Target dead players"
 msgstr "Speler viseren"
 
+#: src/gui/setup_players.cpp:316
+#, fuzzy
+msgid "Secure trades"
+msgstr "Handel goedkeuren"
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr ""
@@ -2476,7 +2481,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -3257,46 +3262,46 @@ msgstr "Naam tonen"
 msgid "Save"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Handelen voorstellen"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Bevestigd. Wachten..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Handel goedkeuren"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Goedgekeurd. Wachten..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Handel: Jij"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Jij krijgt %s."
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Je geeft:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Veranderen"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
 "het venster."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
@@ -3947,7 +3952,7 @@ msgstr "Vensters verbergen"
 
 #: src/keyboardconfig.cpp:147
 #, fuzzy
-msgid "Kills Stats Window"
+msgid "Kill Stats Window"
 msgstr "Statusvenster"
 
 #: src/keyboardconfig.cpp:149
@@ -4010,7 +4015,7 @@ msgid "Copy Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
+msgid "Copy equipped to Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:258
@@ -4035,12 +4040,12 @@ msgstr "Volgende chattab"
 
 #: src/keyboardconfig.cpp:268
 #, fuzzy
-msgid "Previous chat tab line"
+msgid "Previous chat line"
 msgstr "Vorige chattab"
 
 #: src/keyboardconfig.cpp:270
 #, fuzzy
-msgid "Next chat tab line"
+msgid "Next chat line"
 msgstr "Volgende chattab"
 
 #: src/keyboardconfig.cpp:272
@@ -4185,7 +4190,7 @@ msgid "Item is too heavy."
 msgstr ""
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
+msgid "Item is too far away."
 msgstr ""
 
 #: src/localplayer.cpp:1385
@@ -4535,7 +4540,7 @@ msgstr "Attributen van personage OK"
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
@@ -5062,7 +5067,7 @@ msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
 #, fuzzy
-msgid "You already in guild."
+msgid "You are already in guild."
 msgstr "Fout bij het creëren van guild."
 
 #: src/net/tmwa/guildhandler.cpp:120
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 38d7f9eb2..5ddd3f266 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: manaplus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
 "PO-Revision-Date: 2011-03-29 18:51+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium/Flemish) <>\n"
@@ -616,7 +616,7 @@ msgid "Enter password:"
 msgstr "Wachtwoord:"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
-#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Verwijderen"
@@ -874,7 +874,7 @@ msgstr ""
 
 #: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: 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
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "OK"
 
@@ -1272,7 +1272,7 @@ msgid "Away outfit"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Handel"
@@ -2007,46 +2007,51 @@ msgstr "Genegeerd"
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Handelen toestaan"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Fluisteren toestaan"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 msgid "Show gender"
 msgstr "Toon geslacht"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Spelers"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 msgid "Show level"
 msgstr "Toon niveau"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 msgid "Show own name"
 msgstr "Toon eigen naam"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 msgid "Target dead players"
 msgstr ""
 
+#: src/gui/setup_players.cpp:316
+#, fuzzy
+msgid "Secure trades"
+msgstr "Handel goedkeuren"
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr ""
@@ -2326,7 +2331,7 @@ msgid "Sell items"
 msgstr "Verkoop dingen"
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -3077,46 +3082,46 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Handelen voorstellen"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Bevestigd. Wachten..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Handel goedkeuren"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Goedgekeurd. Wachten..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Handel: Jij"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Je geeft:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Veranderen"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
 "het venster."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
@@ -3729,8 +3734,9 @@ msgid "Quick drop Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:147
-msgid "Kills Stats Window"
-msgstr ""
+#, fuzzy
+msgid "Kill Stats Window"
+msgstr "Statusvenster"
 
 #: src/keyboardconfig.cpp:149
 msgid "Commands Window"
@@ -3788,7 +3794,7 @@ msgid "Copy Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
+msgid "Copy equipped to Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:258
@@ -3812,12 +3818,14 @@ msgid "Next Chat Tab"
 msgstr "Volgende chattab"
 
 #: src/keyboardconfig.cpp:268
-msgid "Previous chat tab line"
-msgstr ""
+#, fuzzy
+msgid "Previous chat line"
+msgstr "Vorige chattab"
 
 #: src/keyboardconfig.cpp:270
-msgid "Next chat tab line"
-msgstr ""
+#, fuzzy
+msgid "Next chat line"
+msgstr "Volgende chattab"
 
 #: src/keyboardconfig.cpp:272
 msgid "Chat Auto Complete"
@@ -3951,7 +3959,7 @@ msgid "Item is too heavy."
 msgstr ""
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
+msgid "Item is too far away."
 msgstr ""
 
 #: src/localplayer.cpp:1385
@@ -4273,7 +4281,7 @@ msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
@@ -4748,8 +4756,9 @@ msgid "This command causes the player to leave the guild."
 msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
-msgid "You already in guild."
-msgstr ""
+#, fuzzy
+msgid "You are already in guild."
+msgstr "Fout bij het creëren van guild."
 
 #: src/net/tmwa/guildhandler.cpp:120
 msgid "Emperium check failed."
diff --git a/po/pl.po b/po/pl.po
index d081fc9c3..3ee6f1bc0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
 "PO-Revision-Date: 2009-09-14 06:59+0000\n"
 "Last-Translator: Maciej Benke <syngress_stc@vp.pl>\n"
 "Language-Team: <pl@li.org>\n"
@@ -655,7 +655,7 @@ msgid "Enter password:"
 msgstr "Nieprawidłowe hasło"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
-#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Usuń"
@@ -935,7 +935,7 @@ msgstr ""
 
 #: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: 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
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "Ok"
 
@@ -1352,7 +1352,7 @@ msgid "Away outfit"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Handel"
@@ -2142,50 +2142,55 @@ msgstr "Ignorowany"
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Zezwól na handel"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Zezwól na szepty"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr "Umieść wszystkie szepty w zakładkach"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 #, fuzzy
 msgid "Show gender"
 msgstr "Pokaż imię"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Gracze"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Gdy ignorowany:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 #, fuzzy
 msgid "Show level"
 msgstr "Pokaż imię"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 #, fuzzy
 msgid "Show own name"
 msgstr "Pokaż imię"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 #, fuzzy
 msgid "Target dead players"
 msgstr "Namierz Gracza"
 
+#: src/gui/setup_players.cpp:316
+#, fuzzy
+msgid "Secure trades"
+msgstr "Akceptuj handel"
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr ""
@@ -2485,7 +2490,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Dodaj"
 
@@ -3266,46 +3271,46 @@ msgstr "Pokaż imię"
 msgid "Save"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Oferuj handel"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Potwierdzono. Oczekiwanie..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Akceptuj handel"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Zaakceptowano. Oczekiwanie..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Handel: Ty"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Otrzymujesz %s"
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Dajesz:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Zmień"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
 "rodzaj przedmiotu w okienku."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Nie masz wystarczającej ilości pieniędzy."
 
@@ -3952,7 +3957,7 @@ msgstr "Ukryj Okna"
 
 #: src/keyboardconfig.cpp:147
 #, fuzzy
-msgid "Kills Stats Window"
+msgid "Kill Stats Window"
 msgstr "Okno statusu"
 
 #: src/keyboardconfig.cpp:149
@@ -4015,7 +4020,7 @@ msgid "Copy Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
+msgid "Copy equipped to Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:258
@@ -4040,12 +4045,12 @@ msgstr "Następna zakładka czatu"
 
 #: src/keyboardconfig.cpp:268
 #, fuzzy
-msgid "Previous chat tab line"
+msgid "Previous chat line"
 msgstr "Poprzednia zakładka czatu"
 
 #: src/keyboardconfig.cpp:270
 #, fuzzy
-msgid "Next chat tab line"
+msgid "Next chat line"
 msgstr "Następna zakładka czatu"
 
 #: src/keyboardconfig.cpp:272
@@ -4190,7 +4195,7 @@ msgid "Item is too heavy."
 msgstr ""
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
+msgid "Item is too far away."
 msgstr ""
 
 #: src/localplayer.cpp:1385
@@ -4537,7 +4542,7 @@ msgstr "Statystyki postaci w porządku."
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
@@ -5065,7 +5070,7 @@ msgstr "Komenda powoduje opuszczenie grupy przez gracza"
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
 #, fuzzy
-msgid "You already in guild."
+msgid "You are already in guild."
 msgstr "Błąd podczas tworzenia gildii."
 
 #: src/net/tmwa/guildhandler.cpp:120
diff --git a/po/pt.po b/po/pt.po
index b7bf990ca..8639afb1c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
-"PO-Revision-Date: 2011-05-22 13:59+0000\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
+"PO-Revision-Date: 2011-05-22 17:00+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -608,7 +608,7 @@ 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/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Excluir"
@@ -860,7 +860,7 @@ msgstr "Saída: %d bytes/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:48
-#: src/gui/tradewindow.cpp:82 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "OK"
 
@@ -1258,7 +1258,7 @@ msgid "Away outfit"
 msgstr "Roupas de ocupado"
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Negócios"
@@ -1979,46 +1979,50 @@ msgstr "Ignorado"
 msgid "Erased"
 msgstr "Apagado"
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Permitir negociações"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr "Antigo"
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr "Deixar as mensagens privadas em abas"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 msgid "Show gender"
 msgstr "Mostrar gênero"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 msgid "Show level"
 msgstr "Mostrar nível"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 msgid "Target dead players"
 msgstr "Jogadores mortos como alvo"
 
+#: src/gui/setup_players.cpp:316
+msgid "Secure trades"
+msgstr ""
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr "Tema"
@@ -2300,7 +2304,7 @@ msgid "Sell items"
 msgstr "Vender itens"
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Adicionar"
 
@@ -3048,46 +3052,46 @@ msgstr "Nível da escola:"
 msgid "Save"
 msgstr "Salvar"
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Propor negócio"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Aguardando..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Aceitar negociação"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Aceitou. Aguarde..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Negócio: você"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Você dá:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Mudar"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
@@ -3696,8 +3700,8 @@ msgid "Quick drop Window"
 msgstr "Janela Descarte rápido"
 
 #: src/keyboardconfig.cpp:147
-msgid "Kills Stats Window"
-msgstr "Janela de estatísticas"
+msgid "Kill Stats Window"
+msgstr ""
 
 #: src/keyboardconfig.cpp:149
 msgid "Commands Window"
@@ -3755,8 +3759,8 @@ msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
-msgstr "Copiar roupas equipadas"
+msgid "Copy equipped to Outfit"
+msgstr ""
 
 #: src/keyboardconfig.cpp:258
 msgid "Toggle Chat"
@@ -3779,12 +3783,12 @@ msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
 #: src/keyboardconfig.cpp:268
-msgid "Previous chat tab line"
-msgstr "Volta aba de chat"
+msgid "Previous chat line"
+msgstr ""
 
 #: src/keyboardconfig.cpp:270
-msgid "Next chat tab line"
-msgstr "Passa aba de chat"
+msgid "Next chat line"
+msgstr ""
 
 #: src/keyboardconfig.cpp:272
 msgid "Chat Auto Complete"
@@ -3920,8 +3924,8 @@ msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
-msgstr "Este item está muito longe."
+msgid "Item is too far away."
+msgstr ""
 
 #: src/localplayer.cpp:1385
 msgid "Inventory is full."
@@ -4240,8 +4244,8 @@ msgstr "Atributos do personagem estão muito baixos."
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
-msgstr "Pelo menos um stat fora do alcance permitido: (%u - %u)"
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
 msgid "Invalid slot number."
@@ -4717,8 +4721,8 @@ msgid "This command causes the player to leave the guild."
 msgstr "Este comando faz com que o jogador saia da guilda."
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
-msgid "You already in guild."
-msgstr "Você já está em uma guilda."
+msgid "You are already in guild."
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:120
 msgid "Emperium check failed."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0c8833891..41e1e863f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
-"PO-Revision-Date: 2011-05-22 13:59+0000\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
+"PO-Revision-Date: 2011-05-22 17:00+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/manaplus/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -608,7 +608,7 @@ msgid "Enter password:"
 msgstr "Entre com a senha:"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
-#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Excluir"
@@ -860,7 +860,7 @@ msgstr "Saída: %d bytes/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:48
-#: src/gui/tradewindow.cpp:82 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "OK"
 
@@ -1258,7 +1258,7 @@ msgid "Away outfit"
 msgstr "Roupas de ocupado"
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Negócios"
@@ -1979,46 +1979,50 @@ msgstr "Ignorado"
 msgid "Erased"
 msgstr "Apagado"
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Permitir negociações"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr "Antigo"
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr "Deixar as mensagens privadas em abas"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 msgid "Show gender"
 msgstr "Mostrar gênero"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 msgid "Show level"
 msgstr "Mostrar nível"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 msgid "Target dead players"
 msgstr "Jogadores mortos como alvo"
 
+#: src/gui/setup_players.cpp:316
+msgid "Secure trades"
+msgstr ""
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr "Tema"
@@ -2300,7 +2304,7 @@ msgid "Sell items"
 msgstr "Vender itens"
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Adicionar"
 
@@ -3048,46 +3052,46 @@ msgstr "Nível da escola:"
 msgid "Save"
 msgstr "Salvar"
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Propor negócio"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Aguardando..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Aceitar negociação"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Aceitou. Aguarde..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Negócio: você"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Você dá:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Mudar"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
@@ -3696,8 +3700,8 @@ msgid "Quick drop Window"
 msgstr "Janela Descarte rápido"
 
 #: src/keyboardconfig.cpp:147
-msgid "Kills Stats Window"
-msgstr "Janela de estatísticas"
+msgid "Kill Stats Window"
+msgstr ""
 
 #: src/keyboardconfig.cpp:149
 msgid "Commands Window"
@@ -3755,8 +3759,8 @@ msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
-msgstr "Copiar roupas equipadas"
+msgid "Copy equipped to Outfit"
+msgstr ""
 
 #: src/keyboardconfig.cpp:258
 msgid "Toggle Chat"
@@ -3779,12 +3783,12 @@ msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
 #: src/keyboardconfig.cpp:268
-msgid "Previous chat tab line"
-msgstr "Volta aba de chat"
+msgid "Previous chat line"
+msgstr ""
 
 #: src/keyboardconfig.cpp:270
-msgid "Next chat tab line"
-msgstr "Passa aba de chat"
+msgid "Next chat line"
+msgstr ""
 
 #: src/keyboardconfig.cpp:272
 msgid "Chat Auto Complete"
@@ -3920,8 +3924,8 @@ msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
-msgstr "Este item está muito longe."
+msgid "Item is too far away."
+msgstr ""
 
 #: src/localplayer.cpp:1385
 msgid "Inventory is full."
@@ -4240,8 +4244,8 @@ msgstr "Atributos do personagem estão muito baixos."
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
-msgstr "Pelo menos um stat fora do alcance permitido: (%u - %u)"
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
 msgid "Invalid slot number."
@@ -4717,8 +4721,8 @@ msgid "This command causes the player to leave the guild."
 msgstr "Este comando faz com que o jogador saia da guilda."
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
-msgid "You already in guild."
-msgstr "Você já está em uma guilda."
+msgid "You are already in guild."
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:120
 msgid "Emperium check failed."
diff --git a/po/ru.po b/po/ru.po
index 2390bca2e..c23a46930 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
-"PO-Revision-Date: 2011-05-22 14:02+0000\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
+"PO-Revision-Date: 2011-05-22 17:06+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -614,7 +614,7 @@ 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/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Удалить"
@@ -866,7 +866,7 @@ msgstr "Исх.: %d байт/сек."
 
 #: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: 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
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "ОК"
 
@@ -1264,7 +1264,7 @@ msgid "Away outfit"
 msgstr "наряд отсутствия"
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Торговать"
@@ -1985,46 +1985,50 @@ msgstr "Игнорировано"
 msgid "Erased"
 msgstr "Стерт"
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Разрешить торговлю"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Разрешить шептание"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr "Старые"
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr "Личные сообщения во вкладках"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 msgid "Show gender"
 msgstr "Показать пол"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Игроки"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Когда игнорируется:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 msgid "Show level"
 msgstr "Показать уровень"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 msgid "Show own name"
 msgstr "Показать свое имя"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 msgid "Target dead players"
 msgstr "Наводить фокус на мертвых игроков"
 
+#: src/gui/setup_players.cpp:316
+msgid "Secure trades"
+msgstr "Защитить торговлю"
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr "Тема"
@@ -2308,7 +2312,7 @@ msgid "Sell items"
 msgstr "Продать"
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Добавить"
 
@@ -3056,47 +3060,47 @@ msgstr "Уровень школы:"
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Предложить торговлю"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Подтверждено. Ждем-с..."
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Подтвердить торговлю"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Подтверждено. Ждем-с..."
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Торговля: Вы"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr "Вы получаете %s."
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Вы отдаете:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Сменить"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "У вас недостаточно денег"
 
@@ -3706,7 +3710,7 @@ msgid "Quick drop Window"
 msgstr "Окно быстрого бросания предметов"
 
 #: src/keyboardconfig.cpp:147
-msgid "Kills Stats Window"
+msgid "Kill Stats Window"
 msgstr "Окно статистики атак"
 
 #: src/keyboardconfig.cpp:149
@@ -3765,7 +3769,7 @@ msgid "Copy Outfit"
 msgstr "Копирование наряда"
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
+msgid "Copy equipped to Outfit"
 msgstr "Копирование одетого наряда"
 
 #: src/keyboardconfig.cpp:258
@@ -3789,12 +3793,12 @@ msgid "Next Chat Tab"
 msgstr "Следующая закладка чата"
 
 #: src/keyboardconfig.cpp:268
-msgid "Previous chat tab line"
-msgstr "Предыдущая строка вкладки"
+msgid "Previous chat line"
+msgstr "Предыдущая строка чата"
 
 #: src/keyboardconfig.cpp:270
-msgid "Next chat tab line"
-msgstr "Следующая строка вкладки"
+msgid "Next chat line"
+msgstr "Следующая строка чата"
 
 #: src/keyboardconfig.cpp:272
 msgid "Chat Auto Complete"
@@ -3930,7 +3934,7 @@ msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый"
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
+msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
 #: src/localplayer.cpp:1385
@@ -4247,7 +4251,7 @@ msgstr "Характеристики персонажа слишком малы.
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 "Как минимум, один статистический модификатор, вне разрешённого диапазона: "
 "(%u - %u)."
@@ -4730,7 +4734,7 @@ msgid "This command causes the player to leave the guild."
 msgstr "Эта Команда заставляет игрока покинуть гильдию."
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
-msgid "You already in guild."
+msgid "You are already in guild."
 msgstr "Вы и так в гильдии"
 
 #: src/net/tmwa/guildhandler.cpp:120
diff --git a/po/sv.po b/po/sv.po
index 4927c73bb..fad8eac60 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-22 16:57+0300\n"
+"POT-Creation-Date: 2011-05-22 19:57+0300\n"
 "PO-Revision-Date: 2009-07-17 05:36+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -648,7 +648,7 @@ msgid "Enter password:"
 msgstr "Fel lösenord"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
-#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/setup_players.cpp:244 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
 msgstr "Ta bort"
@@ -928,7 +928,7 @@ msgstr ""
 
 #: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: 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
+#: src/gui/tradewindow.cpp:84 src/gui/tradewindow.cpp:86
 msgid "OK"
 msgstr "Okej"
 
@@ -1349,7 +1349,7 @@ msgid "Away outfit"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
-#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/tradewindow.cpp:85 src/gui/tradewindow.cpp:86
 #: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Byteshandla"
@@ -2139,50 +2139,55 @@ msgstr "Ignorerad"
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_players.cpp:239
+#: src/gui/setup_players.cpp:240
 msgid "Allow trading"
 msgstr "Tillåt byteshandel"
 
-#: src/gui/setup_players.cpp:241
+#: src/gui/setup_players.cpp:242
 msgid "Allow whispers"
 msgstr "Tillåt viskningar"
 
-#: src/gui/setup_players.cpp:244
+#: src/gui/setup_players.cpp:245
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:246
+#: src/gui/setup_players.cpp:247
 msgid "Put all whispers in tabs"
 msgstr "Visa alla viskningar i egna flikar"
 
-#: src/gui/setup_players.cpp:249
+#: src/gui/setup_players.cpp:250
 #, fuzzy
 msgid "Show gender"
 msgstr "Visa namn"
 
-#: src/gui/setup_players.cpp:254
+#: src/gui/setup_players.cpp:256
 msgid "Players"
 msgstr "Spelare"
 
-#: src/gui/setup_players.cpp:279
+#: src/gui/setup_players.cpp:281
 msgid "When ignoring:"
 msgstr "Vid ignorering:"
 
-#: src/gui/setup_players.cpp:302
+#: src/gui/setup_players.cpp:304
 #, fuzzy
 msgid "Show level"
 msgstr "Visa namn"
 
-#: src/gui/setup_players.cpp:306
+#: src/gui/setup_players.cpp:308
 #, fuzzy
 msgid "Show own name"
 msgstr "Visa namn"
 
-#: src/gui/setup_players.cpp:310
+#: src/gui/setup_players.cpp:312
 #, fuzzy
 msgid "Target dead players"
 msgstr "Välj spelare"
 
+#: src/gui/setup_players.cpp:316
+#, fuzzy
+msgid "Secure trades"
+msgstr "Godkänn handel"
+
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
 msgstr ""
@@ -2482,7 +2487,7 @@ msgid "Sell items"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
-#: src/gui/tradewindow.cpp:86
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "Lägg till"
 
@@ -3263,46 +3268,46 @@ msgstr "Visa namn"
 msgid "Save"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:55
+#: src/gui/tradewindow.cpp:56
 msgid "Propose trade"
 msgstr "Föreslå handel"
 
-#: src/gui/tradewindow.cpp:56
+#: src/gui/tradewindow.cpp:57
 msgid "Confirmed. Waiting..."
 msgstr "Bekräftat. Väntar…"
 
-#: src/gui/tradewindow.cpp:57
+#: src/gui/tradewindow.cpp:58
 msgid "Agree trade"
 msgstr "Godkänn handel"
 
-#: src/gui/tradewindow.cpp:58
+#: src/gui/tradewindow.cpp:59
 msgid "Agreed. Waiting..."
 msgstr "Godkänt. Väntar…"
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Trade: You"
 msgstr "Byteshandel: du"
 
-#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Du får %s."
 
-#: src/gui/tradewindow.cpp:109
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "Du ger:"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "Ändra"
 
-#: src/gui/tradewindow.cpp:314
+#: src/gui/tradewindow.cpp:332
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags "
 "sak flera gånger."
 
-#: src/gui/tradewindow.cpp:359
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
@@ -3952,7 +3957,7 @@ msgstr "Dölj fönster"
 
 #: src/keyboardconfig.cpp:147
 #, fuzzy
-msgid "Kills Stats Window"
+msgid "Kill Stats Window"
 msgstr "Statusfönster"
 
 #: src/keyboardconfig.cpp:149
@@ -4015,7 +4020,7 @@ msgid "Copy Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:256
-msgid "Copy Equiped to Outfit"
+msgid "Copy equipped to Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:258
@@ -4040,12 +4045,12 @@ msgstr "Nästa chattflik"
 
 #: src/keyboardconfig.cpp:268
 #, fuzzy
-msgid "Previous chat tab line"
+msgid "Previous chat line"
 msgstr "Föregående chattflik"
 
 #: src/keyboardconfig.cpp:270
 #, fuzzy
-msgid "Next chat tab line"
+msgid "Next chat line"
 msgstr "Nästa chattflik"
 
 #: src/keyboardconfig.cpp:272
@@ -4190,7 +4195,7 @@ msgid "Item is too heavy."
 msgstr ""
 
 #: src/localplayer.cpp:1383
-msgid "Item is too far away"
+msgid "Item is too far away."
 msgstr ""
 
 #: src/localplayer.cpp:1385
@@ -4540,7 +4545,7 @@ msgstr "Karaktärens värden okej"
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
@@ -5067,7 +5072,7 @@ msgstr "Det här kommandot får spelaren att lämna gruppen."
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
 #, fuzzy
-msgid "You already in guild."
+msgid "You are already in guild."
 msgstr "Kunde inte skapa gille."
 
 #: src/net/tmwa/guildhandler.cpp:120