From 11385d29ad80d16b00c42f67a9db583af462b9c1 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 10 Aug 2011 02:02:07 +0300
Subject: Fix translations. Update russian translation.

---
 po/ja.po | 1389 ++++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 1045 insertions(+), 344 deletions(-)

(limited to 'po/ja.po')

diff --git a/po/ja.po b/po/ja.po
index 176f51314..f2299a809 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2011-08-08 01:29+0000\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-09 22:46+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -24,25 +24,25 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
@@ -74,7 +74,8 @@ msgstr "サーバーを入り替え中…"
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "エラー"
@@ -147,7 +148,7 @@ msgstr "%sと言うメッセージタブの作成ができません！それは
 msgid "Requesting to join channel %s."
 msgstr "%sというチャンネルへの参加を要求しています。"
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "パーティ名がない。"
 
@@ -352,35 +353,35 @@ msgstr "PVP ランク：%d"
 msgid "Comment: %s"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "ボット"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "名前"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "攻撃"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "話す"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
 #: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
 msgstr "動く"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "結果"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "リセット"
 
@@ -449,8 +450,8 @@ msgstr "売る"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -619,8 +620,8 @@ msgid "Enter password:"
 msgstr ""
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "削除"
 
@@ -694,10 +695,10 @@ msgid "rainbow 3"
 msgstr "虹 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -888,7 +889,7 @@ msgstr ""
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
@@ -972,7 +973,7 @@ msgstr "重量"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "保存"
 
@@ -1031,89 +1032,89 @@ msgstr "、　"
 msgid "Weight: %s"
 msgstr "重力：%s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "殺人統計ウィンドウ"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "統計をれセット"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "タイマーをれセット"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1776,34 +1777,38 @@ msgid "Tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "プライベートメッセージをタブに出す。"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "バトルタブを有効"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1854,16 +1859,15 @@ msgstr "青"
 msgid "Alpha:"
 msgstr "アルファ："
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "適用"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
 msgid "Edit"
 msgstr "エディット"
 
@@ -2071,148 +2075,200 @@ msgstr ""
 msgid "Show background"
 msgstr "背景を表示する"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "関係"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "普通"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "友達"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "無視"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "無視する"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "消した"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "交換を承認する"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "プライベートメッセージを受け取ることを承認する"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "古い"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "プライベートメッセージをタブに出す。"
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "性的を表示する"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "プレイヤー"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "無視の際には："
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "性的を表示する"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "レベルを表示する"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "自分の名前を表示する"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "名前を表示する"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "名前を表示する"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "関係"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "普通"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "友達"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "無視"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "無視する"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "消した"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "交換を承認する"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "プライベートメッセージを受け取ることを承認する"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "古い"
+
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "無視の際には："
+
+#: src/gui/setup_theme.cpp:106
 msgid "Tiny (10)"
 msgstr "小さい (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Small (11)"
 msgstr "小（11）"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Medium (12)"
 msgstr "媒体（12）"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Large (13)"
 msgstr "大（13）"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Big (14)"
 msgstr "ビッグ（14）"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Huge (15)"
 msgstr "巨大（15）"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr "テーマ"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr "GUIテーマ"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr "メインフォント"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr "太字フォント"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
 msgstr "粒子のフォント"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
 msgstr "ヘルプフォント"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:176
 msgid "Font size"
 msgstr "フォントサイズ"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
 msgstr "テーマは変えました"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更のため、アプリケーションを再起動してください。"
 
@@ -2264,134 +2320,114 @@ msgstr "中"
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "フールスクリーン"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr ""
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "カスタムカーソル"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "粒子効果"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "ピックアップ通知表示"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "チャット中"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "画面内で"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr ""
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr ""
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "FPSリミット"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "ヘッダーテキスト"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "GUI不透明"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "環境FX"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "粒子の詳細"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "なし"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "ウインドウモードでも前のモードの復元もまた失敗しました！"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "フルスクリーンモードでも前のモードの復元もまた失敗しました！"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "フルスクリーンに変更"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "設定変更のため、再起動をしてください。"
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "OpenGLに変更"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGLの設定を変更するため、再起動をしてください。"
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "カスタム解像度（例：1024 × 768）"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "スクリーンの解像度が変わりました。"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "変化はマップがかわったときから影響します。"
 
@@ -2420,7 +2456,8 @@ msgstr "発表する"
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "取引要求"
 
@@ -2462,7 +2499,7 @@ msgstr "Lvl: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Lvl：%d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "ギルド"
 
@@ -2494,7 +2531,7 @@ msgstr "ギルドを残す？"
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "パーティー"
 
@@ -2656,243 +2693,243 @@ msgstr "パーティ名を選んでください"
 msgid "Specials"
 msgstr "スペシアール"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) 動く"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) 襲う"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) 拾い上げる"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) "
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) "
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) 不在で"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -3071,87 +3108,87 @@ msgstr "(b)"
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "ターゲットなし"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "ターゲットを許可する"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "ターゲット必要"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "ジェネラル魔法"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "命魔法"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "戦争魔法"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "変わる魔法"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "自然魔法"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "アストラル魔法"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "コマンドエディタ"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "魔法"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "他"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "シンボル："
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "コマンド："
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "マナ："
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "ターゲットタイプ："
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "アイコン"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "魔法レベル："
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "魔法学園"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "学校レベル："
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "セーブ"
 
@@ -3380,23 +3417,23 @@ msgstr ""
 msgid "Road Point"
 msgstr "ロードのポイント"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr "アップデート"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3461,6 +3498,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "このコマンドでは、入力したユーザーをチャンネルのオペレータとなる"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で囲んでください。"
 
@@ -4192,117 +4230,811 @@ msgstr "買ってくださり、ありがとうございました。"
 msgid "Unable to buy."
 msgstr "購買不可能"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "強さ"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr "筋力:"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr "素早さ:"
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr "体力:"
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr "知性:"
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr "敏捷:"
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr "運:"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr "ID使用不可能。"
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "キャラクター作成失敗。本名はのう使われている。"
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr "名前間違い"
+
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr "不適切な統計。"
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr "不適切な髪。"
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr "不適切なスロット。"
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "情報"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr "キャラクターを削除した。"
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr "キャラ削除失敗"
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr "チャンネルはサポートされていない。"
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
-msgstr "強度 (str) %+.1f"
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "素早さ"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr "プレイヤー MVP"
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr "プレイヤー MVP "
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
-msgstr "機敏さ (agi) %+.1f"
+msgid "Online users: %d"
+msgstr "オンラインユーザー：%d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "器用さ"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr "ゲーム"
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "コマンド: /invite ＜プレイヤー名＞"
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "このコマンドでは、入力したプレイヤーを自分のギルドに招待します。"
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "コマンド: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/helpでこのヘルプを表示する。"
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "ギルド作成成功"
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr "不明なサーバーの応答。"
+
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "Dexterity %+.1f"
-msgstr "器用さ (dex) %+.1f"
+msgid "Guild name: %s"
+msgstr "ギルド名：%s"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "活力"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr "ギルドマスタ： %s"
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "Vitality %+.1f"
-msgstr "活気 (vit) %+.1f"
+msgid "Guild level: %d"
+msgstr "ギルドレベル：%d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "知能"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr "オンラインウザー： %d"
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
-msgid "Intelligence %+.1f"
-msgstr "知能 (int) %+.1f"
+msgid "Max members: %d"
+msgstr "最大のメンバー： %d"
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "気力"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
+msgstr "平均レベル： %d"
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
-msgid "Willpower %+.1f"
-msgstr "意地 (wil) %+.1f"
+msgid "Guild exp: %d"
+msgstr "ギルド経験：%d"
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr "ギルド城：%s"
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr "/inviteでパーティにプレーヤーを招待する。"
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr "/leaveで既存のパーティから離れる。"
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kickで既存のパーティから一人を追い出してみる。"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr "/item でパーティ内のアイテムシェアモードを表示および変更する。"
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp でパーティ内の経験分割モードを表示および変更する。"
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr "このコマンドでは、入力したプレイヤーを自分のパーティーに招待します。"
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr "本コマンドではパティからプレイヤーを追い出させる。"
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr "コマンド: /item <ポリシ>"
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr "本コマンドでは、アイテム共有モードを変更する。"
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"＜ポリシ＞を有効するためには「１」、「yes」か「true」を設定ください。無効にするために、「0」、「no」か「false」を設定ください。"
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr "コマンド: /item"
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr "本コマンドでは、アイテム共有モードを表示する。"
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr "コマンド: /exp <ポリシ>"
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr "本コマンドでは、経験分割モードを変更する。"
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<ポリシ>を有効するためには、「1」、「yes」か「true」を設定ください。無効にする場合、「0」、「no」か「false」を設定ください。"
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr "コマンド: /exp"
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr "本コマンドでは、パーティメンバー以内の経験分割方針を表示する。"
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr "アイテムシェア有効"
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr "アイテムシェア無効"
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr "アイテムシェア不可能"
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr "アイテムシェア不明"
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr "経験シェア有効"
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr "経験シェア無効"
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr "経験シェア不可能"
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr "経験シェア不明"
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr "アイテム使用失敗"
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr "装備不可能"
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr "アカウントが見つからなかった。再ログインをください。"
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr "新パスワードは短い過ぎます。"
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "不明エラー"
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr "未登録なID。"
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr "入力したパスワードは間違っています。"
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr "アカウントの有効期限が切られた。"
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"あなたは%sまでゲームからバーンされた。\n"
+"ゲームマスターたちにご連絡ください。"
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr "ユーザ名はもう使われている。"
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "パーティ作成失敗"
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "パーティ作成成功"
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%sはもうパーティのメンバーである。"
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%sは招待を拒んだ。"
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%sは今からパーティのメンバーになった。"
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr "パーティから離れた。"
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr "%sがパーティから離れた。"
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "不明なメンバーが言おうとした事: %s"
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "あなたは死にました。"
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "残念なお知らせですが、あなた様のキャラは戦闘中亡くなってしまいました。"
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "今から生きていない。"
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "死神の冷たい手に魂が取られてしまった。"
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "ゲームオーバー!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "ゲームを続けるためにはコインを入れてください。"
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに向かっただけ。"
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "喉で的の武器を潰す予定だったが…失敗した。"
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "あんまり上手くいかなかったぜー"
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "持ち物を確定して欲しい？"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "悲しさのあまり、痕跡でさえ見つからなかった。"
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "全滅された。"
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "相手から自分の頭が渡されたみたい。"
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "もう一回倒された、水道管から死体を這ってみた後、新体を受け取ってみて"
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr "まだ死ななかった。休憩中だけである。"
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "あなたはもう存在していない。"
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "生きることなく、いなくなった。"
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr "あなたは息を引き取り、あなたを作った人へ逢いに行ってしまった。"
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr "あなたは死体である。"
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "命を失い、天国に向かった。"
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr "もしあなたがそんなにも生気に満ちていなかったならば、死んで葬られていたんじゃないか？"
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr "あなたのがんばりは今や歴史となったらしい。"
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "クタバッタみたいな。"
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr "人間界から追い出された。"
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr "最後の呼吸だった。死神に会った後、無と結合しちゃった。"
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "旧プレイヤーである。"
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr "お前の魂は北極まで飛ばれた。"
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr "メッセージ"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "持っているアイテムは体重より半分以上なので、体力が回復できない。"
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr "あなたは %s を費やし"
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr "スキルはもう上がらない！"
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr "矢を先に装備してください。"
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr "取引失敗"
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr "スマイリー表示失敗"
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr "触ることが失敗した。"
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr "チャット作成失敗"
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr "パーティに参加できなかった！"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr "叫べない！"
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr "あなたはまだ十分に高いlvlを達していない！"
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr "HP不足！"
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr "SP不足！"
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr "メモなし！"
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr "今この行動は無理。"
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr "金欠みたいんじゃないか…"
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "本スキルがこの武器と使えない。"
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr "他の赤宝石が必要となった！"
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr "他の青宝石が必要となった！"
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr "アイテムが持ちすぎている状態！"
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr "うん？何それ？"
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr "ワープが失敗した。"
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr "何も盗めなかった…"
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr "毒は不効果"
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%sはあなたと取引したいみたいが、応じる？"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "取引は不可能。取引の相手は遠すぎる。"
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "取引は不可能。本キャラが存在していない。"
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr "不明な理由で取引が中止された。"
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr "あなたと%sとの取引"
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "%sとの取引が中止された。"
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr "できなかった取引キャンセルパケット"
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "アイテム追加失敗。相手はアイテムを持ちすぎている状態である。"
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "アイテム追加失敗。相手の空いているスロットはない。"
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr "不明な理由でアイテム追加失敗"
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "取引中止"
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "取引完了"
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "強さ"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "強度 (str) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "素早さ"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "機敏さ (agi) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "器用さ"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "器用さ (dex) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "活力"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "活気 (vit) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "知能"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "知能 (int) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "気力"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "意地 (wil) %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
@@ -4356,16 +5088,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr "無効場所の号"
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "不明エラー"
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "情報"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "プレイヤーは削除された。"
@@ -4429,10 +5151,6 @@ msgstr "%s は％を蹴った %s"
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "ギルド作成成功"
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "ギルド作成エラー"
@@ -4465,10 +5183,6 @@ msgstr ""
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr ""
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "アカウントが接続されていない。最初にログインしてください。"
@@ -4544,24 +5258,11 @@ msgstr "取引要求を受け取り中"
 msgid "Ignoring incoming trade requests."
 msgstr "取引要求を無視にしている。"
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%sはあなたと取引したいみたいが、応じる？"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "%sと取引中"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "取引中止"
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "取引完了"
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "キック失敗"
-- 
cgit v1.2.3-70-g09d2


From c604237abc5fd908c75fdd680143dfa4c76673d6 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 15 Aug 2011 16:35:43 +0300
Subject: Update and rebuild translations. Enabled chinese language.

---
 po/LINGUAS      |    2 +-
 po/POTFILES.in  |    6 +-
 po/de.po        |  625 +++++++++++++++----------------
 po/es.po        |  659 +++++++++++++++++----------------
 po/fi.po        |  628 +++++++++++++++----------------
 po/fr.po        |  627 +++++++++++++++----------------
 po/hr.po        |  625 +++++++++++++++----------------
 po/hu.po        |  625 +++++++++++++++----------------
 po/id.po        |  627 +++++++++++++++----------------
 po/ja.po        |  627 +++++++++++++++----------------
 po/manaplus.pot |  625 +++++++++++++++----------------
 po/nl_BE.po     |  707 +++++++++++++++++------------------
 po/pt.po        |  653 ++++++++++++++++----------------
 po/pt_BR.po     |  653 ++++++++++++++++----------------
 po/ru.po        |  627 +++++++++++++++----------------
 po/zh_CN.po     | 1109 ++++++++++++++++++++++++++++---------------------------
 16 files changed, 4749 insertions(+), 4676 deletions(-)

(limited to 'po/ja.po')

diff --git a/po/LINGUAS b/po/LINGUAS
index a85877412..b917eab69 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -34,6 +34,6 @@ ru
 #th # Disabled because of current client limitations (font fallbacking)
 #tr # Not enough translations
 #uk # Not enough translations
-#zh_CN # Disabled because of current client limitations (font fallbacking)
+zh_CN
 #zh_HK # Disabled because of current client limitations (font fallbacking)
 #zh_TW # Disabled because of current client limitations (font fallbacking)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2c70112ff..76bbeb48a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,7 +26,7 @@ src/gui/itempopup.cpp
 src/gui/killstats.cpp
 src/gui/logindialog.cpp
 src/gui/minimap.cpp
-src/gui/ministatus.cpp
+src/gui/ministatuswindow.cpp
 src/gui/npcdialog.cpp
 src/gui/npcpostdialog.cpp
 src/gui/okdialog.cpp
@@ -61,7 +61,7 @@ src/gui/textcommandeditor.cpp
 src/gui/textdialog.cpp
 src/gui/tradewindow.cpp
 src/gui/unregisterdialog.cpp
-src/gui/updatewindow.cpp
+src/gui/updaterwindow.cpp
 src/gui/userpalette.cpp
 src/gui/whoisonline.cpp
 src/gui/widgets/battletab.cpp
@@ -74,7 +74,7 @@ src/gui/worldselectdialog.cpp
 src/inventory.cpp
 src/keyboardconfig.cpp
 src/localplayer.cpp
-src/log.h
+src/logger.h
 src/main.cpp
 src/net/ea/buysellhandler.cpp
 src/net/ea/charserverhandler.cpp
diff --git a/po/de.po b/po/de.po
index a16699ab1..0252b06f5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"POT-Creation-Date: 2011-08-15 15:56+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
@@ -42,88 +42,88 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Fordere Registrierungsdetails an"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Passwort ändern:"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "erfolgreich abgemeldet."
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Unbekannter Update-Rechner: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -137,7 +137,7 @@ msgstr "Unbekannter Befehl."
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -146,152 +146,152 @@ msgstr ""
 "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
 "einer, oder der Spieler bist du."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Name der Party fehlt."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Bitte gib einen Namen an."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Enter-Taste schließt Chatzeile."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Nachricht schließt Chatzeile."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Jetzt schließt Enter die Chatzeile."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Jetzt schließt jede Nachricht die Chatzeile."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "Freund"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "Spieler wurde nicht ignoriert!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "Spieler wird nicht länger ignoriert!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "Spieler konnte nicht gelöscht werden!"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -309,55 +309,55 @@ msgstr "Allgemein"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -370,19 +370,19 @@ msgstr ""
 msgid "Name"
 msgstr "Name"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Angriff"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Sprechen"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr ""
 
@@ -395,8 +395,8 @@ msgid "Reset"
 msgstr "Zurücksetzten"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Kaufen"
 
@@ -410,7 +410,7 @@ msgstr "Preis: %s / Gesamt: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -418,20 +418,20 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Beenden"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max"
 
@@ -440,8 +440,8 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Geschäft"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -450,19 +450,19 @@ msgstr "Verkaufen"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -628,7 +628,7 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -715,12 +715,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ;%d Spieler sind anwesend."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüsternd zu %s: %s"
@@ -733,10 +733,10 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr ""
 
@@ -882,7 +882,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Schließen"
 
@@ -899,7 +899,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
@@ -909,8 +909,8 @@ msgstr "Ausrüstung"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Ablegen"
 
@@ -948,31 +948,31 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Ausrüsten"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Benutzen"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Aufteilen"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Ausrüstung"
 
@@ -981,17 +981,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Einlagern"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Wegwerfen"
@@ -1145,7 +1145,7 @@ msgstr ""
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
@@ -1170,43 +1170,43 @@ msgstr "Registrieren"
 msgid "Change Server"
 msgstr "Wechsle den Server"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Muss"
 
@@ -1227,7 +1227,7 @@ msgstr "Absenden"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr ""
 
@@ -1265,327 +1265,328 @@ msgstr "erstes ausziehen"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handeln"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "@@ignore|Ignoriere %s komplett@@"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr ""
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Server wechseln"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Spielfigur wechseln"
 
@@ -1621,64 +1622,64 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Verbinde..."
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben"
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "benötigt eine neuere Version"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "benötigt v%s"
@@ -1872,11 +1873,11 @@ msgstr "Blau: "
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Anwenden"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
@@ -2176,6 +2177,10 @@ msgstr ""
 msgid "Show statuses"
 msgstr ""
 
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Beziehung"
@@ -2950,178 +2955,178 @@ msgstr ""
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr ""
 
@@ -3257,33 +3262,33 @@ msgstr "Du hast nicht genügend Geld."
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Aktualisiere..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Los!"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen,"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Fertig"
 
diff --git a/po/es.po b/po/es.po
index 9c0d754d5..2e1f15442 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:46+0000\n"
+"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"PO-Revision-Date: 2011-08-15 13:02+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/es/)\n"
@@ -44,88 +44,88 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Cargando jugadores"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
-msgstr "Host de actualización inválido: %s"
+msgstr "Servidor de actualización inválido: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
-msgstr "¡Error creando la carpeta de actualizaciones!"
+msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
@@ -138,7 +138,7 @@ msgstr "Comando desconocido."
 msgid "Cannot send empty whispers!"
 msgstr "¡No puedes enviar susurros vacíos!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -147,152 +147,152 @@ msgstr ""
 "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando la entrada del canal %s."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Falta el nombre del gremio."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Volver a alternar el chat."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Mensaje cierra la charla."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Volver ahora a cambiar de chat."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Mensaje ahora cierra el chat."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "desatendido"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "neutral"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "¡Jugador ya es %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "¡Jugador %s exitosamente!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "¡Jugador no pudo ser %s!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "El jugador no estaba ignorado!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "¡El jugador ya no es ignorado!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "¡Al jugador no se le puede dejar de ignorar!"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "¡Jugador ya borrado!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "¡Jugador borrado con éxito!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "¡Jugador no pudo ser borrado!"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr "tamaño de caché de fuente"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr "Tám. caché:"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr "Creado:"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr "Borrado:"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
@@ -310,55 +310,55 @@ msgstr "General"
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con elservidor."
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Gremio: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Rango PVP: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
@@ -371,19 +371,19 @@ msgstr "Bot Checker"
 msgid "Name"
 msgstr "Nombre"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Hablar"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Mover"
 
@@ -396,8 +396,8 @@ msgid "Reset"
 msgstr "Restablecer"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Comprar"
 
@@ -411,7 +411,7 @@ msgstr "Precio: %s / Total: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -419,20 +419,20 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Salir"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Máximo"
 
@@ -441,8 +441,8 @@ msgstr "Máximo"
 msgid "Shop"
 msgstr "Tienda"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -451,19 +451,19 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -629,7 +629,7 @@ msgstr "Ingrese la contraseña para borrar el personaje"
 msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -716,12 +716,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores estan presentes."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando mensaje privado para %s: %s"
@@ -734,10 +734,10 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -883,7 +883,7 @@ msgstr "¿Sabías que...?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Cerrar"
 
@@ -900,7 +900,7 @@ msgid "Auto open this window"
 msgstr "Abrir automáticamente esta ventana"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -910,8 +910,8 @@ msgstr "Equipamiento"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Quitárselo"
 
@@ -949,31 +949,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Tirar..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Conjuntos"
 
@@ -982,17 +982,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Almacenar"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Tirar"
@@ -1146,7 +1146,7 @@ msgstr "Saltar"
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
@@ -1171,43 +1171,43 @@ msgstr "Registrar"
 msgid "Change Server"
 msgstr "Cambiar de servidor"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr "barra de salud"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr "barra de maná"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr "barra de experiencia"
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr "barra de trabajo"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr "barra de peso"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr "barra de ranuras del inventario"
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr "barra de dinero"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr "Barra de flechas"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr "barra de estado"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Necesitas"
 
@@ -1228,7 +1228,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -1266,327 +1266,328 @@ msgstr "Quitárselo antes"
 msgid "Away outfit"
 msgstr "Fuera conjunto"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Intercambio"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "Susurrar"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr "Sanar"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr "Ser amigo"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr "Desatender"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr "Borrar"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr "Des-ignorar"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr "Imitación"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr "Invitar a grupo"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr "Sacar del grupo"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr "Sacar del gremio"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr "Cambiar posición en el gremio"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr "Invitar al gremio"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr "Sacar jugador"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr "Eliminar"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Mostrar artículos"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr "Desvestir"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr "Agregar comentario"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr "Sacar"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr "Remover de la lista de ataque"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr "Añadir a la lista de ataque prioritaria"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr "Agregar a la lista de ataque"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr "Recoger"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr "Cargar conjuntos antiguos"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Hechizos"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr "Cargar hechizos antiguos"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr "Editar hechizo"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr "No remover nombre"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr "Remover nombre"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Dejar"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Cambiar posición del gremio"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Nombre:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr "Comentario del jugador            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr "Comentario:                      "
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr "Agredar al intercambio"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Almacenar 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Almacenar todo"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr "Tirar todo"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Cargar atajos antiguos de artículos"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Cargar atajos antiguos de soltar (drop)"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(predeterminado)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr "Subir"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr "Bajar"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Guardar estado"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Cambiar de servidor"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Cambiar de personaje"
 
@@ -1622,64 +1623,64 @@ msgstr "La contraseña debe tener como mínimo %d caracteres."
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Escoja tu servidor"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Elige tu servidor  *** MODO SEGURO ***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Usar el mismo ip para los subservidores del juego"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Cargar"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Servidor propio"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique el nombre y el puerto del servidor."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Bajando la lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Error al recuperar la lista de servers!"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "requiere una version mas nueva"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -1726,7 +1727,7 @@ msgstr "Anuncio"
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
-msgstr "Necesitas reiniciar el client si quieres descargar la musica"
+msgstr "Necesitas reiniciar el cliente si quieres descargar nueva música"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
@@ -1873,11 +1874,11 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Restaurar Ventanas"
 
@@ -1887,7 +1888,7 @@ msgstr "Editar"
 
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
-msgstr "Aprieta el botón para empezar a calibrar"
+msgstr "Presiona el botón para empezar la calibración"
 
 #: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
@@ -2091,15 +2092,15 @@ msgstr "Mostrar fondo"
 
 #: src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
-msgstr ""
+msgstr "Rendimiento"
 
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
-msgstr ""
+msgstr "Mejor rendimiento (permite obtener un mejor rendimiento)"
 
 #: src/gui/setup_perfomance.cpp:58
 msgid "Auto adjust perfomance"
-msgstr ""
+msgstr "Ajustar rendimiento automáticamente"
 
 #: src/gui/setup_perfomance.cpp:61
 msgid "Show beings transparency"
@@ -2111,7 +2112,7 @@ msgstr "Aceleración de hardware"
 
 #: src/gui/setup_perfomance.cpp:67
 msgid "Enable opacity cache (Software, can use many memory)"
-msgstr ""
+msgstr "Habilitar caché de opacidad (Software, puede usar mucha memoria)"
 
 #: src/gui/setup_perfomance.cpp:70
 msgid "Enable map reduce (Software)"
@@ -2119,11 +2120,11 @@ msgstr ""
 
 #: src/gui/setup_perfomance.cpp:73
 msgid "Better quality (disable for better perfomance)"
-msgstr ""
+msgstr "Mejor calidad (desabilitar para un mejor desmpeño)"
 
 #: src/gui/setup_perfomance.cpp:76
 msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr ""
+msgstr "Habilitar corrección de canal alfa (Software, puede ser muy lento)"
 
 #: src/gui/setup_perfomance.cpp:80
 msgid "Enable reorder sprites."
@@ -2131,7 +2132,7 @@ msgstr ""
 
 #: src/gui/setup_perfomance.cpp:83
 msgid "Small memory (enable for lower memory usage)"
-msgstr ""
+msgstr "Poca memoria (permite un uso más bajo de memoria)"
 
 #: src/gui/setup_perfomance.cpp:86
 msgid "Disable advanced beings caching (Software)"
@@ -2177,6 +2178,10 @@ msgstr "Carácteres inseguros en los nombres"
 msgid "Show statuses"
 msgstr "Mostrar estados"
 
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Relación"
@@ -2215,7 +2220,7 @@ msgstr "Viejo"
 
 #: src/gui/setup_relations.cpp:246
 msgid "Relations"
-msgstr ""
+msgstr "Relaciones"
 
 #: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
@@ -2950,178 +2955,178 @@ msgstr "Modificadores del juego están deshabilitados"
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Dinero: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "PV:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "PM:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Trabajo: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Trabajo:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "Puntos del personaje: %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nivel: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr "Puntos de corrección: %d"
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
@@ -3257,33 +3262,33 @@ msgstr "No tienes dinero suficiente."
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Jugar"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  El proceso de actualización esta incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr "##1 lo intentes de nuevo más tarde."
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Completado"
 
@@ -4164,7 +4169,7 @@ msgstr "              usado para establecer parámetros personalizados."
 
 #: src/main.cpp:50
 msgid "              to the manaplus client."
-msgstr "              to the manaplus client."
+msgstr "              al cliente manaplus."
 
 #: src/main.cpp:52
 msgid "Options:"
@@ -4657,7 +4662,7 @@ msgstr ""
 
 #: src/net/ea/loginhandler.cpp:221
 msgid "Client too old."
-msgstr "Cliente es demasiado viejo."
+msgstr "Cliente es demasiado antíguo."
 
 #: src/net/ea/loginhandler.cpp:224
 #, c-format
@@ -5245,8 +5250,8 @@ msgstr "El nuevo e-mail ya existe."
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
-"El registro no está soportado. Por favor contacta un administrador del "
-"server."
+"El registro desde el cliente no está soportado. Por favor contacta con la "
+"administración del servidor."
 
 #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
diff --git a/po/fi.po b/po/fi.po
index 727437865..5b5b5388e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"POT-Creation-Date: 2011-08-15 15:56+0300\n"
 "PO-Revision-Date: 2011-08-09 22:45+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,88 +40,88 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
@@ -134,7 +134,7 @@ msgstr "Tuntematon komento."
 msgid "Cannot send empty whispers!"
 msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -143,152 +143,152 @@ msgstr ""
 "Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
 "käytit omaa nimeäsi."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Pyyntö liittyä kanavalle %s lähetetty."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Ryhmän nimi puuttuu."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Killan nimi puuttuu."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Anna nimi."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Nyt viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "ystävä"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "vaimennettu"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "neutraali"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "Pelaaja on jo %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pelaaja on nyt %s."
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "Pelaajaa ei ollut jätetty huomiotta!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "Pelaaja huomioidaan taas."
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "Pelaaja on jo pyyhitty!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "Pelaaja pyyhitty."
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty."
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d viikon"
 msgstr[1] "%d viikkoa"
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivän"
 msgstr[1] "%d päivää"
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunnin"
 msgstr[1] "%d tuntia"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutin"
 msgstr[1] "%d minuuttia"
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunnin"
 msgstr[1] "%d sekuntia"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr "kirjasinvälimuistin koko"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr "Välimuistin koko:"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr "Luotu:"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr "Poistettu:"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
@@ -307,55 +307,55 @@ msgstr "Yleiset"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Ryhmä: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Kilta: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "PvP-taso: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -368,19 +368,19 @@ msgstr "Bottitutka"
 msgid "Name"
 msgstr "Nimi"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Hyökkää"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Keskustele"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Liiku"
 
@@ -393,8 +393,8 @@ msgid "Reset"
 msgstr "Nollaa"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Osta"
 
@@ -408,7 +408,7 @@ msgstr "Hinta: %s / Kaikkiaan: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -416,20 +416,20 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Sulje"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max"
 
@@ -438,8 +438,8 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Kauppa"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -448,19 +448,19 @@ msgstr "Myy"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Peru"
 
@@ -626,7 +626,7 @@ msgstr "Anna salasana hahmon poistamiseksi"
 msgid "Enter password:"
 msgstr "Salasana:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -713,12 +713,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Kuiskaat pelaajalle %s: %s"
@@ -731,10 +731,10 @@ msgstr "Kyllä"
 msgid "No"
 msgstr "Ei"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Ohita"
 
@@ -880,7 +880,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Sulje"
 
@@ -897,7 +897,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
@@ -907,8 +907,8 @@ msgstr "Varusteet"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
@@ -946,31 +946,31 @@ msgid "id"
 msgstr "#"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Ota käyttöön"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Käytä"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Pudota..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Jaa"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
 
@@ -979,17 +979,17 @@ msgid "Weight:"
 msgstr "Paino:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Varastoi"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Ota"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Pudota"
@@ -1143,7 +1143,7 @@ msgstr "Ohita"
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Palvelin:"
@@ -1168,43 +1168,43 @@ msgstr "Rekisteröidy"
 msgid "Change Server"
 msgstr "Vaihda palvelinta"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr "terveyspalkki"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr "manapalkki"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr "kokemuspalkki"
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr "työpalkki"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr "painopalkki"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr "tavarapaikkapalkki"
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr "rahapalkki"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr "nuolipalkki"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr "tilapalkki"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Tarvitaan"
 
@@ -1225,7 +1225,7 @@ msgstr "Lähetä"
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -1263,327 +1263,328 @@ msgstr "Riisu ensin"
 msgid "Away outfit"
 msgstr "Poissaoloasu"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Tee kaupat"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "Kuiskaa"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr "Paranna"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr "Ystävysty"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr "Vaimenna"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr "Pyyhi"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr "Seuraa"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr "Matki"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr "Potki killasta"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr "Muuta kilta-asemaa"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr "Kutsu kiltaan"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr "Potki pelaaja"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr "Pommita"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr "Riisu"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr "Potki"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr "Poista hyökkäyslistasta"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr "Lisää prioriteettihyökkäyslistalle"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr "Lisää hyökkäyslistaan"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Lisää nimi keskusteluun"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr "Nosta"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Karttaolio"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "Poista"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr "Lataa vanhat asut"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Loitsut"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr "Lataa vanhat loitsut"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr "Muokkaa loitsua"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Estä korostus"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Salli korostus"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr "Älä poista nimeä"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr "Poista nimi"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr "Ota poissaolo käyttöön"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Eroa"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Muuta merkin nimeä       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr "Lisää 10 kauppaan"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr "Lisää puolet kauppaan"
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Varastoi 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Varastoi puolet"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Lataa vanhat tavarapikavalinnat"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Lataa vanhat pudotuspikavalinnat"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr "Piilota"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "Näytä"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(oletus)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr "Siirrä ylös"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr "Siirrä alas"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Tallenna tila"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Vaihda palvelinta"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Vaihda hahmoa"
 
@@ -1619,64 +1620,64 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Valitse palvelimesi"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Portti:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Käytä samaa IP-osoitetta alipalvelimille"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Palvelintyyppi:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Lataa"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Muu palvelin"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lataan palvelinluettelon...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Odotan palvelinta..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Valmistelen latausta"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "vaatii uudemman version"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "vaatii version %s"
@@ -1870,11 +1871,11 @@ msgstr "Sininen:"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Hyväksy"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
@@ -2174,6 +2175,10 @@ msgstr ""
 msgid "Show statuses"
 msgstr ""
 
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Relaatio"
@@ -2945,178 +2950,178 @@ msgstr "Pelimuokkaimet poissa käytöstä"
 msgid "Game modifiers are enabled"
 msgstr "Pelimuokkaimet käytössä"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Rahat: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "VP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Kok:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Työ: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Työ:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "Hahmopisteitä: %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Taso: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr "Korjauspisteitä: %d"
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
@@ -3250,33 +3255,33 @@ msgstr "Sinulla ei ole tarpeeksi rahaa."
 msgid "Name: %s"
 msgstr "Nimi: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Pelaa"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  Päivitysprosessi keskeytyi"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Suosittelemme vahvasti että"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr "##1  yrität myöhemmin uudelleen"
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Valmis"
 
@@ -5486,3 +5491,6 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
+
+#~ msgid "Save state"
+#~ msgstr "Tallenna tila"
diff --git a/po/fr.po b/po/fr.po
index 81428920d..dd19797ae 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:45+0000\n"
+"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"PO-Revision-Date: 2011-08-15 13:02+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
 "fr/)\n"
@@ -43,88 +43,88 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -138,7 +138,7 @@ msgstr "Commande inconnue."
 msgid "Cannot send empty whispers!"
 msgstr "Vous ne pouvez pas envoyer de messages vides."
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -147,153 +147,153 @@ msgstr ""
 "Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
 "\". Soit elle existe déjà, soit il s'agit de vous même."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Demande de rejoindre le canal %s."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Le nom du groupe est manquant."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Le nom de la guilde est manquant."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Veuillez indiquer un nom."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "La touche <entrée> ferme la ligne d'entrée du chat."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Le message ferme la conversation."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr ""
 "La touche <entrée> ferme maintenant la ligne d'entrée de la conversation."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Le message ferme maintenant la conversation."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "ami"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "écarté"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "neutre"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "Joueur déjà %s !"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Joueur  %s avec succès!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Le joueur n'a pas pu %s !"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "Le joueur n'était pas ignoré !"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "Le joueur n'est plus ignoré !"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "Joueur déjà effacé !"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "Joueur éliminé avec succès !"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "le joueur n'a pas pu être effacé !"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d secondes"
 msgstr[1] "%d secondes"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr "Taille du cache de polices"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr "Dimension du cache :"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr "Créé : "
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr "Effacé :"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
@@ -311,56 +311,56 @@ msgstr "Général"
 msgid "Debug"
 msgstr "Informations"
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée sous"
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr "La sauvegarde de la capture d'écran a échoué !"
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr ""
 "La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargée"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Groupe : %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilde : %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Rang PvP : %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
@@ -373,19 +373,19 @@ msgstr "Testeur de Robot"
 msgid "Name"
 msgstr "Nom"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Attaquer"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Parler"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Déplacement"
 
@@ -398,8 +398,8 @@ msgid "Reset"
 msgstr "Réinitialiser"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Acheter"
 
@@ -413,7 +413,7 @@ msgstr "Prix : %s / Total : %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -421,20 +421,20 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Quitter"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max."
 
@@ -443,8 +443,8 @@ msgstr "Max."
 msgid "Shop"
 msgstr "Boutique"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -453,19 +453,19 @@ msgstr "Vendre"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -631,7 +631,7 @@ msgstr "Entrer le mot de passe pour effacer le personnage"
 msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -718,12 +718,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Conversation"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message envoyé à %s : %s"
@@ -736,10 +736,10 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -885,7 +885,7 @@ msgstr "Le saviez-vous ?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Fermer"
 
@@ -902,7 +902,7 @@ msgid "Auto open this window"
 msgstr "Ouverture automatique de cette fenêtre"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
@@ -912,8 +912,8 @@ msgstr "Équipement"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Retirer"
 
@@ -951,31 +951,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Équiper"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Utiliser"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Jeter..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Partager"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Tenues"
 
@@ -984,17 +984,17 @@ msgid "Weight:"
 msgstr "Poids :"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Entreposer"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Jeter"
@@ -1148,7 +1148,7 @@ msgstr "Sauter"
 msgid "Login"
 msgstr "Compte"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Serveur :"
@@ -1173,43 +1173,43 @@ msgstr "S'inscrire"
 msgid "Change Server"
 msgstr "Changer de Serveur"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr "Barre de vie"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr "Barre de Mana"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr "Barre d'expérience"
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr "Barre de compétences"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr "Barre de poids"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr "Barre emplacements d'inventaire"
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr "Barre d'argent"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr "Barre de flèches"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr "Barre de Statut"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Restant"
 
@@ -1230,7 +1230,7 @@ msgstr "Soumettre"
 msgid "NPC"
 msgstr "PNJ"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Effacer"
 
@@ -1268,327 +1268,328 @@ msgstr "Retirer d'abord l'équipement"
 msgid "Away outfit"
 msgstr "Équipement en absence"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Échange"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "Message"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr "Soigner"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr "Être ami"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr "Éviter"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr "Éliminer"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr "Suivre"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr "Imiter"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr "Sortir du groupe"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr "Sortir de la guilde"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr "Changer la position dans la guilde"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr "Inviter dans la guilde"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr "Sortir le joueur"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr "Annihiler"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Montrer les objets"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr "Déshabiller"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr "Virer"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr "Enlever de la liste d'attaque"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr "Ajouter à la liste de priorités d'attaque"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr "Ajouter à la liste d'attaque"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Ajouter le nom dans la boite de dialogue"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr "Ramasser"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Objet de carte"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "Enlever"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr "Charger les anciennes tenues"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Sortilèges"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr "Charger les anciens sorts"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr "Éditer le sortilège"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Désactiver la surbrillance"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Activer la surbrillance"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr "N'enlève pas le nom"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr "Enlève le nom"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr "Active la fonction Absence"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Quitter"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Changer la position de la Guilde"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Nom : "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr "Le joueur commente            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr "Commentaire :                      "
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Entreposer 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Entreposer tout"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr "Jeter tout"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Charger les anciens raccourcis d'objets"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Charger les anciens raccourcis de jets d'objets"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr "Cacher"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "Montrer"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(défaut)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr "Aller vers le haut"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr "Aller vers le bas"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Sauvegarder l'état"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Changer de serveur"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Changer de personnage"
 
@@ -1624,64 +1625,64 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe sont différents"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Choisissez le serveur"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Choisissez votre serveur  *** Mode Sûr ***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Port :"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Type de Serveur :"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Charger"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Connexion..."
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Serveur personnalisé"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Veuillez entrer l'adresse et le port du serveur."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste de serveur !"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
@@ -1874,11 +1875,11 @@ msgstr "Bleu : "
 msgid "Alpha:"
 msgstr "Opacité : "
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
@@ -2178,6 +2179,10 @@ msgstr "Caractère à risque dans le nom"
 msgid "Show statuses"
 msgstr "Montrer les Status"
 
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Relation"
@@ -2960,178 +2965,178 @@ msgstr "Modificateurs de mode de jeu désactivés"
 msgid "Game modifiers are enabled"
 msgstr "Modificateurs de mode de jeu activés"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Argent : %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "Vie :"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Exp :"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "PM :"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Métier : %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Compétences :"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "Points de caractéristiques du personnage : %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau : %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr "Points de correction : %d"
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
@@ -3267,33 +3272,33 @@ msgstr "Vous n'avez pas assez d'argent."
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Mise à jour en cours..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Jouer"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 Le processus de mise à jour n'est pas achevé"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Il est fortement recommandé que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr "##1 Essayez à nouveau plus tard"
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Terminé"
 
diff --git a/po/hr.po b/po/hr.po
index bc6a9eed4..f208048c2 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"POT-Creation-Date: 2011-08-15 15:56+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,88 +40,88 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Greška"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -134,7 +134,7 @@ msgstr "Nepoznata naredba."
 msgid "Cannot send empty whispers!"
 msgstr "Ne mogu poslati prazan šapate!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -143,97 +143,97 @@ msgstr ""
 "Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili ste to "
 "vi."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Zahtjev za pridruživanje kanalu %s."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Ime partije nedostaje."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Poruka zatvara chat."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Poruka sada zatvara chat."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -241,7 +241,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -249,7 +249,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -257,7 +257,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -265,7 +265,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -273,27 +273,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -310,55 +310,55 @@ msgstr "Općenito"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr "Mreža Greška"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr "Greška prilikom učitavanja %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -371,19 +371,19 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Napad"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Govori"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr ""
 
@@ -396,8 +396,8 @@ msgid "Reset"
 msgstr "Poništi"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Kupi"
 
@@ -411,7 +411,7 @@ msgstr "Cijena: %s / Ukupno: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr ""
 
@@ -419,20 +419,20 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Izlaz"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max"
 
@@ -441,8 +441,8 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Trgovina"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -451,19 +451,19 @@ msgstr "Prodaj"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Poništi"
 
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -716,12 +716,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
@@ -734,10 +734,10 @@ msgstr "Da"
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr ""
 
@@ -883,7 +883,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Zatvori"
 
@@ -900,7 +900,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "U redu"
 
@@ -910,8 +910,8 @@ msgstr "Oprema"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Skini opremu"
 
@@ -949,31 +949,31 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Opremi"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Upotrijebi"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Razdvoji"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr ""
 
@@ -982,17 +982,17 @@ msgid "Weight:"
 msgstr "Težina:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Pohrani"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Ispusti"
@@ -1148,7 +1148,7 @@ msgstr ""
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Poslužitelj:"
@@ -1173,43 +1173,43 @@ msgstr "Registriraj se"
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
@@ -1230,7 +1230,7 @@ msgstr "Dostavi"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr ""
 
@@ -1268,327 +1268,328 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Trgovanje"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr ""
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Promijeni poslužitelj"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Promijeni lika"
 
@@ -1624,64 +1625,64 @@ msgstr "Lozinka mora biti kraća od %d znakova."
 msgid "Passwords do not match."
 msgstr "Lozinke se ne podudaraju."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1873,11 +1874,11 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Primjeni"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Ponovno pokreni prozore"
 
@@ -2177,6 +2178,10 @@ msgstr ""
 msgid "Show statuses"
 msgstr ""
 
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Odnos"
@@ -2947,178 +2952,178 @@ msgstr ""
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Novac: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Zadatak: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Zadatak:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr ""
 
@@ -3252,33 +3257,33 @@ msgstr "Nemate dovoljno novca."
 msgid "Name: %s"
 msgstr "Ime: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Ažuriranje"
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Spajanje..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Igraj"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces ažuriranja je nepotpun."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Vrlo je preporučljivo da"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Dovršeno"
 
diff --git a/po/hu.po b/po/hu.po
index d9d0871cb..101fc0090 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"POT-Creation-Date: 2011-08-15 15:56+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,88 +39,88 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Beállítások"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Hiba"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -133,7 +133,7 @@ msgstr "Ismeretlen parancs."
 msgid "Cannot send empty whispers!"
 msgstr "Nem küldhetsz üres üzenetet!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -141,152 +141,152 @@ msgid ""
 msgstr ""
 "Nem tudsz fület létrehozni \"%s\" számára! Létre van hozva, vagy te vagy az."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "A csapatnév hiányzik."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Az enter megnyitja a bevitelt."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Az üzenet bezárja a bevitelt."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Az enter mostantól megnyitja a bevitelt."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Az üzenet mostantól bezárja a bevitelt."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -305,55 +305,55 @@ msgstr "Általános"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr "Kereskedési kérelmek elutasítása"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr "Hiba %s betöltése közben"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -366,19 +366,19 @@ msgstr ""
 msgid "Name"
 msgstr "Név"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Támadás"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Csevegés"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr ""
 
@@ -391,8 +391,8 @@ msgid "Reset"
 msgstr "Alaphelyzet"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Vétel"
 
@@ -406,7 +406,7 @@ msgstr "Ár: %s / Teljes: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr ""
 
@@ -414,20 +414,20 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Kilépés"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max."
 
@@ -436,8 +436,8 @@ msgstr "Max."
 msgid "Shop"
 msgstr "Üzlet"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -446,19 +446,19 @@ msgstr "Eladás"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -624,7 +624,7 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -711,12 +711,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %s"
@@ -729,10 +729,10 @@ msgstr "Igen"
 msgid "No"
 msgstr "Nem"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr ""
 
@@ -878,7 +878,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Bezár"
 
@@ -895,7 +895,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
@@ -905,8 +905,8 @@ msgstr "Felszerelés"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Nem használ"
 
@@ -944,31 +944,31 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Használ"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Bevet"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Felosztás"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr ""
 
@@ -977,17 +977,17 @@ msgid "Weight:"
 msgstr "Súly:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Raktároz"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Eldob"
@@ -1141,7 +1141,7 @@ msgstr ""
 msgid "Login"
 msgstr "Belépés"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Szerver:"
@@ -1166,43 +1166,43 @@ msgstr "Regisztráció"
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
@@ -1223,7 +1223,7 @@ msgstr "Küldés"
 msgid "NPC"
 msgstr "Gépjátékos"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr ""
 
@@ -1261,327 +1261,328 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Üzlet"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr ""
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Szerver változtatása"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Karakter változtatása"
 
@@ -1617,64 +1618,64 @@ msgstr "A jelszónak legfeljebb %d karakter hosszúnak kell lennie."
 msgid "Passwords do not match."
 msgstr "A jelszavak nem egyeznek."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Kérlek írd be a szerver címét és portját egyaránt."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1866,11 +1867,11 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Alkalmaz"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Ablakok alaphelyzetbe"
 
@@ -2170,6 +2171,10 @@ msgstr ""
 msgid "Show statuses"
 msgstr ""
 
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Kapcsolat"
@@ -2940,178 +2945,178 @@ msgstr ""
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Szint: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Pénz: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "Élet:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "TP:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "Varázserő:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Munka: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Munka:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr ""
 
@@ -3246,33 +3251,33 @@ msgstr "Nincs elég pénzed."
 msgid "Name: %s"
 msgstr "Név: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Frissítés…"
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Csatlakozás…"
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Játék"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 A frissítési folyamat befejezetlen"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Erősen ajánljuk, hogy"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Kész"
 
diff --git a/po/id.po b/po/id.po
index c73cbe7ad..ac13c61ac 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:47+0000\n"
+"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"PO-Revision-Date: 2011-08-15 13:02+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
 "id/)\n"
@@ -42,88 +42,88 @@ msgstr "A"
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Pengaturan"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Masuk"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Ubah sandi"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Perubahan email"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Gagal mengupdate host: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
@@ -136,7 +136,7 @@ msgstr "Perintah tidak dikenal."
 msgid "Cannot send empty whispers!"
 msgstr "Tidak dapat mengirimkan pesan tanpa nama"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -145,147 +145,147 @@ msgstr ""
 "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
 "atau nama anda sendiri"
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Meminta untuk masuk ke channel %s."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Nama kelompok tidak dapat di temukan"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Nama organisasi tidak ditemukan."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Tetapkan sebuah nama"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Kembalikan pengalihan obrolan"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Tutup pesan obrolan"
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Kembalikan sekarang pengalihan obrolan"
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Pesan menutup obrolan"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "Teman"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "Diabaikan"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "netral"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "Pemain telah %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pemain telah berhasil %s!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Pemain tidak bisa %s!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "Pemain tidak diabaikan!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "Pemain tidak lagi diabaikan!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Pemain tidak dapat diabaikan"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "Pemain telah terhapus"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "Pemain telah berhasil dihapus"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "Pemain tidak dapat dihapus"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr "Ukuran jenis huruf cache"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr "Ukuran Cache:"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr "Buat"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr "Hapus"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr "Sumber gambar"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -303,55 +303,55 @@ msgstr "Umum"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr "Screenshot disimpan sebagai"
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus"
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr "Abaikan permohonan transaksi"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error ketika menunggu %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Kelompok: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Organisasi: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Peringkat Pvp: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
@@ -364,19 +364,19 @@ msgstr "Pengecek Bot"
 msgid "Name"
 msgstr "Nama"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Pukul"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Berbicara"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Jalan"
 
@@ -389,8 +389,8 @@ msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Beli"
 
@@ -404,7 +404,7 @@ msgstr "Harga: %s/ Total: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -412,20 +412,20 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Keluar"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max"
 
@@ -434,8 +434,8 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Toko"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -444,19 +444,19 @@ msgstr "Jual"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Batal"
 
@@ -622,7 +622,7 @@ msgstr "Masukan Sandi untuk menghapus karakter"
 msgid "Enter password:"
 msgstr "Masukkan sandi"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -709,12 +709,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Obrolan"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Kehadiran: %s; %d pemain yang hadir."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Berbisik ke %s: %s"
@@ -727,10 +727,10 @@ msgstr "Ya"
 msgid "No"
 msgstr "Tidak"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Abaikan"
 
@@ -876,7 +876,7 @@ msgstr "Apakah kamu tahu?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Tutup"
 
@@ -893,7 +893,7 @@ msgid "Auto open this window"
 msgstr "Buka jendela otomatis"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -903,8 +903,8 @@ msgstr "Perlengkapan"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Lepaskan"
 
@@ -942,31 +942,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Pakai"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Gunakan"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Buang..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Pecah"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Setelan"
 
@@ -975,17 +975,17 @@ msgid "Weight:"
 msgstr "Berat"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Simpan"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Kembalikan"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Buang"
@@ -1137,7 +1137,7 @@ msgstr "lanjutkan"
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
@@ -1162,43 +1162,43 @@ msgstr "Mendaftar"
 msgid "Change Server"
 msgstr "Menganti Server"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Butuh"
 
@@ -1219,7 +1219,7 @@ msgstr "Masukan"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Hapus"
 
@@ -1257,327 +1257,328 @@ msgstr "Copot lebih dahulu"
 msgid "Away outfit"
 msgstr "Setelan saat bepergian"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Tukar"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "Berbisik"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr "Menyembuhkan"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr "Jadikan teman"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr "Hapus"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr "Batalkan pengabaian"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr "Mengikuti"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr "Tirukan"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr "Undang ke kelompok"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr "Keluarkan dari organisasi"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr "Ubah posisi di organisasi"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr "Undang ke organisasi"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr "keluarkan  pemain"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr "Sembunyikan"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Perlihatkan item"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr "Tanggalkan pakaian"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr "Penambahan komentar"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr "keluarkan"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr "Hapus dari daftar menyerang"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr "Tambahkan prioritas daftar menyerang"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr "Tambahkan ke daftar menyerang"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr "Tambahkan ke daftar Abaikan"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Tambahkan nama ke Obrolan"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr "Ambil"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Ambil ke obrolan"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Daftar barang"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr "Ganti nama"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "Hapus"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr "Memuat setelan lama"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Mantra"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr "Memuat mantra lama"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr "Edit mantra"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Nonaktifkan sorotan"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Aktifkan sorotan"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr "Nama jangan di hapus"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr "hapus nama"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Ubah posisi Organisasi"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Ubah nama tanda peta"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Nama:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr "Komentar pemain"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr "komentar"
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Tambahkan semua ke Penukaran"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Masukkan 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Masukkan setengah"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Masukkan semua"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr "Buang semuanya"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Muat jalan pintas iItem lama"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Muat jalan pintas Buang yang lama"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr "Sembunyikan"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "Tampilkan"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr "Pindahkan ke chat"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(kembalikan)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr "Bergerak keatas"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Simpan posisi"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Ganti Server"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Ganti Karakter"
 
@@ -1613,64 +1614,64 @@ msgstr "Panjang kata sandi tidak boleh kurang dari %d karakter."
 msgid "Passwords do not match."
 msgstr "Kata sandi cocok."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Pilih Server Anda"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Pilih Servermu *** SAFE MODE ***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Gunakan ip yang sama untuk sub server game"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Tipe server:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Memuat"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Menyambung"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Modifikasi server"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Tolong tulis address dan port dari server"
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Mengunduh daftar server... %2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Menyambung ke server..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Menyiapkan pengunduhan"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Gagal mengunduh data server!"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "Membutuhkan versi terbaru"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "Membutuhkan v%s"
@@ -1862,11 +1863,11 @@ msgstr "Biru:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Terapkan"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
@@ -2166,6 +2167,10 @@ msgstr "Penggunaan karakter yang tidak diperbolehkan pada nama"
 msgid "Show statuses"
 msgstr "Perlihatkan status"
 
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Hubungan"
@@ -2936,178 +2941,178 @@ msgstr "Perombakan game tidak diperbolehkan"
 msgid "Game modifiers are enabled"
 msgstr "Perombakan game diperbolehkan"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(l)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
@@ -3241,33 +3246,33 @@ msgstr "Anda tidak memiliki cukup uang."
 msgid "Name: %s"
 msgstr "Nama: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Mengupdate..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Main"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index f2299a809..7a95c076f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:46+0000\n"
+"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"PO-Revision-Date: 2011-08-15 13:02+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -42,88 +42,88 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "サーバー通信中…"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "ログイン中…"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "ゲームの世界に入る中"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "服：％d"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "ゲームサーバー通信中…"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "サーバーを入り替え中…"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "登録細目を要請中"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "パスワード変更成功！"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "メール変更"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "メール変更成功！"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "登録解除成功"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "さよなら、いつでも戻ってね..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s は存在しないので作成することが不可能！終了中…"
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:  %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー： %s は存在しないので作成することが不可能！終了中…"
@@ -136,154 +136,154 @@ msgstr "不明なコマンド"
 msgid "Cannot send empty whispers!"
 msgstr "空のメッセージを送信することはできません！"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr "%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分です。"
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "%sというチャンネルへの参加を要求しています。"
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "パーティ名がない。"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "ギルド名がない。"
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "名前を教えてください。"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "リターンはチャットを留めておきます。"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "メッセージはチャットを閉じます。"
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "リターンはこれからチャットを留めておきます。"
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "メッセージはこれからチャットを閉じます。"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "友達"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "無視"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "中性"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "プレイヤーはもう%s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "プレイヤーは%s成功！"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "選手は%sを居られなかった "
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "プレイヤーは無視されなかった！"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "プレイヤーはもう無視していない！"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Playerはunignoredことができなかった！"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "プレイヤーはもう消している!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "プレーアが首尾よくに消去！"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間：%s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -300,55 +300,55 @@ msgstr "一般"
 msgid "Debug"
 msgstr "デバッグ"
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存することに失敗しました！"
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr "他人からのトレードリクエストを無視します。"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr "他人からのトレードリクエストを受け入れます。"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr "マップをロードできませんでした"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sをロードしている間にエラーが起きました。"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "パーティ：%s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "ギルド：%s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "PVP ランク：%d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -361,19 +361,19 @@ msgstr "ボット"
 msgid "Name"
 msgstr "名前"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "攻撃"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "話す"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "動く"
 
@@ -386,8 +386,8 @@ msgid "Reset"
 msgstr "リセット"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "買う"
 
@@ -401,7 +401,7 @@ msgstr "価格:%s /合計:%s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -409,20 +409,20 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "終了"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "最大"
 
@@ -431,8 +431,8 @@ msgstr "最大"
 msgid "Shop"
 msgstr "店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -441,19 +441,19 @@ msgstr "売る"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -619,7 +619,7 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -706,12 +706,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "チャット"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sに送信中： %s"
@@ -724,10 +724,10 @@ msgstr "はい"
 msgid "No"
 msgstr "いいえ"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "無視"
 
@@ -873,7 +873,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "閉じる"
 
@@ -890,7 +890,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -900,8 +900,8 @@ msgstr "装備"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "外す"
 
@@ -939,31 +939,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "装備する"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "使う"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "落とす..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "分割する"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "服"
 
@@ -972,17 +972,17 @@ msgid "Weight:"
 msgstr "重量"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "保存"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "取り戻す"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "落とす"
@@ -1134,7 +1134,7 @@ msgstr "スキップ"
 msgid "Login"
 msgstr "ログイン"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "サーバ:"
@@ -1159,43 +1159,43 @@ msgstr "登録する"
 msgid "Change Server"
 msgstr "サーバーを変える"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr "健康"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr "マナ"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr "経験"
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr "職"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr "重量"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr "金銭"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr "矢"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr "情勢"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "必要"
 
@@ -1216,7 +1216,7 @@ msgstr "決定"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "クリア"
 
@@ -1254,327 +1254,328 @@ msgstr "外す第一"
 msgid "Away outfit"
 msgstr "装備一式不在で"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交換"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "完全無視"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "チャットに追加"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "マップアイテム"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "取り去る"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "呪文"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "でる"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr " 名前:   "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr "に貿易を足す"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "10保存"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "半分保存"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "全部保存"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "10取る"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "半分取る"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "全部取る"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr " 隠す"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "見せる"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr ""
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "保存状態"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "サーバーを切り替える"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "キャラクターを切り替える"
 
@@ -1610,64 +1611,64 @@ msgstr "パスワードは%d文字より短くなくてはいけません。"
 msgid "Passwords do not match."
 msgstr "パスワードが一致していません。"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "サーバを選ぶ"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "ポート:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "サーバー形"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "ロード"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "通信"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "カスタムサーバー"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "サーバのアドレスとポート番号を両方入力してください。"
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "サーバーを待っている..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "ダウンロード準備中..."
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "要る v%s"
@@ -1859,11 +1860,11 @@ msgstr "青"
 msgid "Alpha:"
 msgstr "アルファ："
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "適用"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
@@ -2163,6 +2164,10 @@ msgstr ""
 msgid "Show statuses"
 msgstr ""
 
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "関係"
@@ -2933,178 +2938,178 @@ msgstr ""
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "GP:%s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "経験値:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "ジョブ: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "ジョブポイント:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "キャラクターポイント： %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "レベル： %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr "修正点： %d"
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
@@ -3239,33 +3244,33 @@ msgstr "現金不足です。"
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "更新しています..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "接続しています..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "プレイ"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  アップデートは完了していません。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 とても推奨されます。"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "完了"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 7a08621e7..fd3517a1d 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-08-10 01:11+0300\n"
+"POT-Creation-Date: 2011-08-15 15:56+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"
@@ -40,88 +40,88 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -134,159 +134,159 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -303,55 +303,55 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -364,19 +364,19 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr ""
 
@@ -389,8 +389,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr ""
 
@@ -404,7 +404,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr ""
 
@@ -412,20 +412,20 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr ""
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr ""
 
@@ -434,8 +434,8 @@ msgstr ""
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -444,19 +444,19 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr ""
 
@@ -622,7 +622,7 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -709,12 +709,12 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -727,10 +727,10 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr ""
 
@@ -876,7 +876,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr ""
 
@@ -893,7 +893,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
 
@@ -903,8 +903,8 @@ msgstr ""
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr ""
 
@@ -942,31 +942,31 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr ""
 
@@ -975,17 +975,17 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
@@ -1139,7 +1139,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
@@ -1164,43 +1164,43 @@ msgstr ""
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
@@ -1221,7 +1221,7 @@ msgstr ""
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr ""
 
@@ -1259,327 +1259,328 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr ""
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr ""
 
@@ -1615,64 +1616,64 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -1864,11 +1865,11 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr ""
 
@@ -2168,6 +2169,10 @@ msgstr ""
 msgid "Show statuses"
 msgstr ""
 
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr ""
@@ -2938,178 +2943,178 @@ msgstr ""
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr ""
 
@@ -3243,33 +3248,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index e0b3b1618..de3106afe 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:44+0000\n"
+"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"PO-Revision-Date: 2011-08-15 13:02+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
 "manaplus/team/nl_BE/)\n"
@@ -41,88 +41,88 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -135,7 +135,7 @@ msgstr "Onbekend commando."
 msgid "Cannot send empty whispers!"
 msgstr "Kan geen lege berichten sturen!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -144,152 +144,152 @@ msgstr ""
 "Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds "
 "bestaat, of het is jezelf."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Guild-naam ontbreekt."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Ga terug naar chat"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Ga nu terug naar chat."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "vriend"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "genegeerd"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "neutraal"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "Speler reeds %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Speler succesvol %s!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Speler kan niet %s zijn!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "Speler is niet genegeerd!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "Speler niet langer genegeerd!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Speler kan niet worden genegeerd!"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "Speler reeds verwijderd!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "Speler succesvol verwijderd!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "Speler kan niet worden verwijderd!"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -307,55 +307,55 @@ msgstr "Algemeen"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr "Scherafdruk opgeslagen als:"
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Groep: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Gilde: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Pvp rang: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -368,19 +368,19 @@ msgstr "Bot Controleerder"
 msgid "Name"
 msgstr "Naam"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Aanvallen"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Spreken"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Beweeg"
 
@@ -393,8 +393,8 @@ msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Kopen"
 
@@ -408,7 +408,7 @@ msgstr "Prijs: %s / Totaal: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -416,20 +416,20 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Afsluiten"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Maximum"
 
@@ -438,8 +438,8 @@ msgstr "Maximum"
 msgid "Shop"
 msgstr "Winkel"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -448,19 +448,19 @@ msgstr "Verkopen"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -626,7 +626,7 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -713,12 +713,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -731,10 +731,10 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Negeer"
 
@@ -880,7 +880,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Sluiten"
 
@@ -897,7 +897,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -907,8 +907,8 @@ msgstr "Uitrusting"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -946,31 +946,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Gebruiken"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Neerleggen..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Splitsen"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Kleren"
 
@@ -979,17 +979,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Neerleggen"
@@ -1143,7 +1143,7 @@ msgstr "Overslaan"
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
@@ -1168,43 +1168,43 @@ msgstr "Aanmelden"
 msgid "Change Server"
 msgstr "Wijzig Server"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Nood"
 
@@ -1225,7 +1225,7 @@ msgstr "Indienen"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Wissen"
 
@@ -1263,327 +1263,328 @@ msgstr "Verwijder uitrusting eerst"
 msgid "Away outfit"
 msgstr "Kleren om weg te gaan"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Spreuken"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
-msgstr ""
+msgstr "Laad oude spreuken"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
-msgstr ""
+msgstr "Wijzig spreuk"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Verlaat"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Naam:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Plaats 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Plaats de helft"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Plaats alles"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Laden van oude voorwerpsnelkoppelingen"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Laden van oude neerleggingsnelkoppeling"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr ""
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Status bewaren"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Van server wisselen"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Van personage wisselen"
 
@@ -1619,64 +1620,64 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Kies Uw Server"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Gebruik hetzelfde ip voor spel sub-servers"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Server type:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Laden"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Verbinden"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Manuele Server"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Typ aub zowel het adres van de server, als de poort."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloaden van server lijst...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Wachten op server..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Download voorbereiden"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "vereist een nieuwere versie"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "vereist v%s"
@@ -1870,11 +1871,11 @@ msgstr "Blauw:"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
@@ -2174,6 +2175,10 @@ msgstr ""
 msgid "Show statuses"
 msgstr ""
 
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Relatie"
@@ -2463,11 +2468,11 @@ msgstr "Toevoegen"
 
 #: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
 msgid "Announce"
-msgstr ""
+msgstr "Aankondigingen"
 
 #: src/gui/shopwindow.cpp:125
 msgid "Show links in announce"
-msgstr ""
+msgstr "Toon links in aankondigingen"
 
 #: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
 #: src/net/manaserv/tradehandler.cpp:127
@@ -2565,16 +2570,16 @@ msgstr ""
 #: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
-msgstr ""
+msgstr "Wie zou u willen uitnodigen in group %s?"
 
 #: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
-msgstr ""
+msgstr "Verlaten Groep?"
 
 #: src/gui/socialwindow.cpp:295
 #, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr ""
+msgstr "Bent u zeker dat u groep %s wilt verlaten?"
 
 #: src/gui/socialwindow.cpp:521
 msgid "Nav"
@@ -2602,7 +2607,7 @@ msgstr "Guild aanmaken"
 
 #: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr ""
+msgstr "Groep aanmaken"
 
 #: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
@@ -2615,22 +2620,22 @@ msgstr "Nodig uit"
 #: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
-msgstr ""
+msgstr "Uitnodiging voor groep %s aanvaard."
 
 #: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
-msgstr ""
+msgstr "Uitnodiging voor groep %s geweigerd."
 
 #: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
-msgstr ""
+msgstr "Uitnodiging voor guild %s aanvaard."
 
 #: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
-msgstr ""
+msgstr "Uitnodiging voor guild %s geweigerd."
 
 #: src/gui/socialwindow.cpp:1257
 #, c-format
@@ -2652,7 +2657,7 @@ msgstr "Kies uw guild naam"
 
 #: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
-msgstr ""
+msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
 #: src/gui/socialwindow.cpp:1315
 #, c-format
@@ -2661,7 +2666,7 @@ msgstr ""
 
 #: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
-msgstr ""
+msgstr "Guild Uitnodiging Aanvaarden"
 
 #: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
@@ -2669,12 +2674,12 @@ msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
 #: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
-msgstr ""
+msgstr "U bent uitgenodigd om je bij een groep te voegen."
 
 #: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
-msgstr ""
+msgstr "U bent uitgenodigd om je bij groep %s te voegen."
 
 #: src/gui/socialwindow.cpp:1359
 #, c-format
@@ -2692,7 +2697,7 @@ msgstr "Groepsuitnodiging aanvaarden"
 
 #: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
-msgstr ""
+msgstr "Kan groep niet aanmaken. Je bent al in een groep."
 
 #: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
@@ -2946,178 +2951,178 @@ msgstr ""
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "Leven:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Ervaring:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "Magie:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr ""
 
@@ -3253,33 +3258,33 @@ msgstr "Je hebt niet genoeg geld."
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Actualiseren..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Spelen"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr "##1  probeer later opnieuw."
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -4023,11 +4028,11 @@ msgstr "Snel jezelf of iemand anders genezen"
 
 #: src/keyboardconfig.cpp:313
 msgid "Use #itenplz spell"
-msgstr ""
+msgstr "Gebruik #itenplz spreuk"
 
 #: src/keyboardconfig.cpp:315
 msgid "Use magic attack"
-msgstr ""
+msgstr "Gebruik magie aanval"
 
 #: src/keyboardconfig.cpp:317
 msgid "Switch magic attack"
@@ -4151,15 +4156,15 @@ msgstr ""
 
 #: src/main.cpp:47
 msgid "manaplus [options] [mana-file]"
-msgstr ""
+msgstr "manaplus [opties] [mana-bestand]"
 
 #: src/main.cpp:48
 msgid "[mana-file] : The mana file is an XML file (.mana)"
-msgstr ""
+msgstr "[mana-bestand]: Het mana bestand is een XML bestand (.mana)"
 
 #: src/main.cpp:49
 msgid "              used to set custom parameters"
-msgstr ""
+msgstr "              om manuele parameters te gebruiken"
 
 #: src/main.cpp:50
 msgid "              to the manaplus client."
@@ -4171,75 +4176,75 @@ msgstr "Opties:"
 
 #: src/main.cpp:53
 msgid "  -l --log-file       : Log file to use"
-msgstr ""
+msgstr "  -l --log-file       : Log bestand te gebruiken"
 
 #: src/main.cpp:54
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr ""
+msgstr "  -L --chat-log-dir   : Chat log bestand te gebruiken"
 
 #: src/main.cpp:55
 msgid "  -v --version        : Display the version"
-msgstr ""
+msgstr "  -v --version        : Toon de versie"
 
 #: src/main.cpp:56
 msgid "  -h --help           : Display this help"
-msgstr ""
+msgstr "  -h --help           : Toon deze help"
 
 #: src/main.cpp:57
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
+msgstr "  -C --config-dir     : Configuratie map te gebruiken"
 
 #: src/main.cpp:58
 msgid "  -U --username       : Login with this username"
-msgstr ""
+msgstr "  -U --username       : Login met deze gebruikersnaam"
 
 #: src/main.cpp:59
 msgid "  -P --password       : Login with this password"
-msgstr ""
+msgstr "  -P --password       : Loging met dit wachtwoord"
 
 #: src/main.cpp:60
 msgid "  -c --character      : Login with this character"
-msgstr ""
+msgstr "  -c --character      : Login met dit karakter"
 
 #: src/main.cpp:61
 msgid "  -s --server         : Login server name or IP"
-msgstr ""
+msgstr "  -s --server         : Login servernaam of IP"
 
 #: src/main.cpp:62
 msgid "  -p --port           : Login server port"
-msgstr ""
+msgstr "  -p --port           : Login serverpoort"
 
 #: src/main.cpp:63
 msgid "     --update-host    : Use this update host"
-msgstr ""
+msgstr "     --update-host    : Updateserver te gebruiken"
 
 #: src/main.cpp:64
 msgid "  -D --default        : Choose default character server and character"
-msgstr ""
+msgstr "  -D --default        : Kies standaard karakterserver en karakter"
 
 #: src/main.cpp:66
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
+msgstr "  -u --skip-update    : update downloads overslaan"
 
 #: src/main.cpp:67
 msgid "  -d --data           : Directory to load game data from"
-msgstr ""
+msgstr "  -d --data           : Map om spelgegevens te laden"
 
 #: src/main.cpp:69
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
+msgstr "  -L --localdata-dir  : Map te gebruiken als lokale data map"
 
 #: src/main.cpp:71
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
+msgstr "     --screenshot-dir: Map te gebruiken om screenshots te bewaren"
 
 #: src/main.cpp:72
 msgid "     --safemode       : Start game in safe mode"
-msgstr ""
+msgstr "     --safemode       : Start spel in veilige modus"
 
 #: src/main.cpp:74
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr ""
+msgstr "     --no-opengl      : Zet OpenGL af voor deze sessie"
 
 #: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
diff --git a/po/pt.po b/po/pt.po
index 16fc2d85f..eb4b45e79 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:46+0000\n"
+"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"PO-Revision-Date: 2011-08-15 13:02+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
 "pt/)\n"
@@ -42,88 +42,88 @@ msgstr "A"
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -136,7 +136,7 @@ msgstr "Comando desconhecido."
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -145,152 +145,152 @@ msgstr ""
 "Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
 "já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr "Tamanho do cache de fonte"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr "Tamanho de Cache:"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
@@ -308,55 +308,55 @@ msgstr "Geral"
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Posição no PVP: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
@@ -369,19 +369,19 @@ msgstr "Analizador de bot"
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Falar"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Mover"
 
@@ -394,8 +394,8 @@ msgid "Reset"
 msgstr "Resetar"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Comprar"
 
@@ -409,7 +409,7 @@ msgstr "Preço: %s / Total: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -417,20 +417,20 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Sair"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Máximo"
 
@@ -439,8 +439,8 @@ msgstr "Máximo"
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -449,19 +449,19 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -627,7 +627,7 @@ msgstr "Entre com a Senha para Deletar o usuario"
 msgid "Enter password:"
 msgstr "Entre com a senha"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -714,12 +714,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -732,10 +732,10 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -881,7 +881,7 @@ msgstr "Você sabia?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Fechar"
 
@@ -898,7 +898,7 @@ msgid "Auto open this window"
 msgstr "Abrir automaticamente esta janela"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -908,8 +908,8 @@ msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -947,31 +947,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -980,17 +980,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Descartar"
@@ -1144,7 +1144,7 @@ msgstr "Passar"
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
@@ -1169,43 +1169,43 @@ msgstr "Registrar"
 msgid "Change Server"
 msgstr "Trocar servidor"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr "Barra de Vida"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr "Barra de Mana"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr "Barra de experiencia "
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr "Barra de Job"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr "Barra de Peso"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr "Barra de slots no inventário"
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr "Barra de Dinheiro"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr "Barra de flechas"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr "Barra de Status"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Precisa"
 
@@ -1226,7 +1226,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1264,327 +1264,328 @@ msgstr "Desequipar antes"
 msgid "Away outfit"
 msgstr "Roupas de ocupado"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Negócios"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "Sussuro"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr "Curar:"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr "Ser Amigo"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr "Ser inimigo"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr "Apagar"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr "Não ignorar"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr "Imitar"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr "Chutar da Guilda"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr "Mudar posição da Guilda"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr "Convidar para Guilda"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr "Chutar Jogador"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr "Deixar pelado"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Mostar itens:"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr "Deixar sem Roupas"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr "Chutar"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr "Remover da Lista de Ataques"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr "Adicionar a prioridade na lista de ataques"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Nome no chat"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Mapa Item"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "A Remover"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr "Carregar Antigas Roupas"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Feitiços"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr "Carregar Antigos Feitiços"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr "Editar Feitiços"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr "Não remover nome"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr "Remover nome"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr "Comentário do jogador"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr "Comentário:"
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr "Descartar tudo"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr "Mover a cima"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr "Mover a baixo"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Salvar Estado"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Trocar servidor"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Trocar de Personagem"
 
@@ -1620,64 +1621,64 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Servidor customizado"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -1870,11 +1871,11 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
@@ -2088,19 +2089,19 @@ msgstr "Mostrar imagem de fundo"
 
 #: src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
-msgstr ""
+msgstr "Performance"
 
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
-msgstr ""
+msgstr "Melhor performance (Habilite para melhor performance)"
 
 #: src/gui/setup_perfomance.cpp:58
 msgid "Auto adjust perfomance"
-msgstr ""
+msgstr "Auto ajuste de performance"
 
 #: src/gui/setup_perfomance.cpp:61
 msgid "Show beings transparency"
-msgstr ""
+msgstr "Mostrar transparencia "
 
 #: src/gui/setup_perfomance.cpp:64
 msgid "Hw acceleration"
@@ -2108,35 +2109,35 @@ msgstr "Aceleração por HW"
 
 #: src/gui/setup_perfomance.cpp:67
 msgid "Enable opacity cache (Software, can use many memory)"
-msgstr ""
+msgstr "Habilitar cache de opacidade (Software, pode usar muita memória)"
 
 #: src/gui/setup_perfomance.cpp:70
 msgid "Enable map reduce (Software)"
-msgstr ""
+msgstr "Habilitar redução de mapa (Software)"
 
 #: src/gui/setup_perfomance.cpp:73
 msgid "Better quality (disable for better perfomance)"
-msgstr ""
+msgstr "Melhor qualidade (Desative para melhor performace)"
 
 #: src/gui/setup_perfomance.cpp:76
 msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr ""
+msgstr "Habilitar correção de canal alpha (Software, pode ficar muito lento)"
 
 #: src/gui/setup_perfomance.cpp:80
 msgid "Enable reorder sprites."
-msgstr ""
+msgstr "Habilitar reordenar sprites"
 
 #: src/gui/setup_perfomance.cpp:83
 msgid "Small memory (enable for lower memory usage)"
-msgstr ""
+msgstr "Menos memória (Habilite para menos uso de memória)"
 
 #: src/gui/setup_perfomance.cpp:86
 msgid "Disable advanced beings caching (Software)"
-msgstr ""
+msgstr "Desabilitar cache avançado (Software)"
 
 #: src/gui/setup_perfomance.cpp:89
 msgid "Disable beings caching (Software)"
-msgstr ""
+msgstr "Desabilitar cache (Software)"
 
 #: src/gui/setup_players.cpp:48
 msgid "Players"
@@ -2174,6 +2175,10 @@ msgstr "Letras de nome inseguras"
 msgid "Show statuses"
 msgstr "Ver status"
 
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Relação"
@@ -2212,7 +2217,7 @@ msgstr "Antigo"
 
 #: src/gui/setup_relations.cpp:246
 msgid "Relations"
-msgstr ""
+msgstr "Relações"
 
 #: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
@@ -2948,178 +2953,178 @@ msgstr "Modificadores de jogo desativados"
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo ativados"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(4)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
@@ -3254,33 +3259,33 @@ msgstr "Você não tem dinheiro suficiente."
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Concluído"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2ce64d4d8..d40dd0ee6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:44+0000\n"
+"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"PO-Revision-Date: 2011-08-15 13:02+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/pt_BR/)\n"
@@ -44,88 +44,88 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -138,7 +138,7 @@ msgstr "Comando desconhecido."
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -147,152 +147,152 @@ msgstr ""
 "Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
 "já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr "Tamanho de fonte Cache"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr "Tamanho de cache:"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
@@ -310,55 +310,55 @@ msgstr "Geral"
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Posição no PVP: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
@@ -371,19 +371,19 @@ msgstr "Analizador de bot"
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Falar"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Mover"
 
@@ -396,8 +396,8 @@ msgid "Reset"
 msgstr "Resetar"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Comprar"
 
@@ -411,7 +411,7 @@ msgstr "Preço: %s / Total: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -419,20 +419,20 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Sair"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Máximo"
 
@@ -441,8 +441,8 @@ msgstr "Máximo"
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -451,19 +451,19 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -629,7 +629,7 @@ msgstr "Entre com a senha para apagar o personagem"
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -716,12 +716,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -734,10 +734,10 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -883,7 +883,7 @@ msgstr "Você Sabia?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Fechar"
 
@@ -900,7 +900,7 @@ msgid "Auto open this window"
 msgstr "Auto abrir esta janela"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -910,8 +910,8 @@ msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -949,31 +949,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -982,17 +982,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Descartar"
@@ -1146,7 +1146,7 @@ msgstr "Passar"
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
@@ -1171,43 +1171,43 @@ msgstr "Registrar"
 msgid "Change Server"
 msgstr "Trocar servidor"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr "Barra de Vida"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr "Barra de Mana"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr "Barra de experiencia "
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr "Barra de Job"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr "Barra de Peso"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr "Barra de slots no inventário"
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr "Barra de Dinheiro"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr "Barra de flechas"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr "Barra de Status"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Precisa"
 
@@ -1228,7 +1228,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1266,327 +1266,328 @@ msgstr "Desequipar antes"
 msgid "Away outfit"
 msgstr "Roupas de ocupado"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Negócios"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "Mensagem Privada:"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr "Cura"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr "Ser amigo"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr "Ser inimigo"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr "Apagar"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr "Não ignorar"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr "Imitar"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr "Expulsar da guilda"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr "Mudar pos na Guilda"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr "Convidar pra Guilda"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr "Chutar Jogador"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr "Nu"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Mostrar itens:"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr "Despir"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr "Add comentário"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr "vender (?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr "Chutar"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr "Remover da lista de ataque"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr "Adicionar na prioridade da lista de ataques"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Nome no chat"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Mapa Item"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "Remover"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr "Carregar velhas roupas"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Feitiços"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr "Carregar velhos feitiços"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr "Editar feitiços"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr "Não remover o nome"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr "Remover o nome"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr "Habilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr "Comentário do jogador"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr "Comentário:"
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr "Descartar tudo"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr "Mover para baixo"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Salvar Estado"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Trocar servidor"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Trocar de Personagem"
 
@@ -1622,64 +1623,64 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Servidor customizado"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -1872,11 +1873,11 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
@@ -2090,19 +2091,19 @@ msgstr "Mostrar imagem de fundo"
 
 #: src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
-msgstr ""
+msgstr "Performance"
 
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
-msgstr ""
+msgstr "Melhor peformance (habilitar para melhor peformance)"
 
 #: src/gui/setup_perfomance.cpp:58
 msgid "Auto adjust perfomance"
-msgstr ""
+msgstr "Auto ajustar performance"
 
 #: src/gui/setup_perfomance.cpp:61
 msgid "Show beings transparency"
-msgstr ""
+msgstr "Mostrar transparencia"
 
 #: src/gui/setup_perfomance.cpp:64
 msgid "Hw acceleration"
@@ -2110,35 +2111,35 @@ msgstr "Aceleração por HW"
 
 #: src/gui/setup_perfomance.cpp:67
 msgid "Enable opacity cache (Software, can use many memory)"
-msgstr ""
+msgstr "Habilitar cache de opacidade (Software, pode se usar muita memória)"
 
 #: src/gui/setup_perfomance.cpp:70
 msgid "Enable map reduce (Software)"
-msgstr ""
+msgstr "Habilitar redução de mapa (Software)"
 
 #: src/gui/setup_perfomance.cpp:73
 msgid "Better quality (disable for better perfomance)"
-msgstr ""
+msgstr "Melhor qualidade (desabilita para melhor performance)"
 
 #: src/gui/setup_perfomance.cpp:76
 msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr ""
+msgstr "Habilitar ajuste de canal alpha (Software, pode ficar muito lento)"
 
 #: src/gui/setup_perfomance.cpp:80
 msgid "Enable reorder sprites."
-msgstr ""
+msgstr "Habilitar reordenar sprites."
 
 #: src/gui/setup_perfomance.cpp:83
 msgid "Small memory (enable for lower memory usage)"
-msgstr ""
+msgstr "Menos memória (habilite para usar menos memória)"
 
 #: src/gui/setup_perfomance.cpp:86
 msgid "Disable advanced beings caching (Software)"
-msgstr ""
+msgstr "Desabilitar cache avançado (Software)"
 
 #: src/gui/setup_perfomance.cpp:89
 msgid "Disable beings caching (Software)"
-msgstr ""
+msgstr "Desabilitar cache (Software)"
 
 #: src/gui/setup_players.cpp:48
 msgid "Players"
@@ -2176,6 +2177,10 @@ msgstr "Letras inseguras no nome"
 msgid "Show statuses"
 msgstr "Mostrar status"
 
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Relação"
@@ -2214,7 +2219,7 @@ msgstr "Antigo"
 
 #: src/gui/setup_relations.cpp:246
 msgid "Relations"
-msgstr ""
+msgstr "Relações"
 
 #: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
@@ -2950,178 +2955,178 @@ msgstr "Modificadores de jogo desativados"
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(l)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
@@ -3256,33 +3261,33 @@ msgstr "Você não tem dinheiro suficiente."
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Concluído"
 
diff --git a/po/ru.po b/po/ru.po
index 7e17f4c88..59eb7179d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 23:00+0000\n"
+"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"PO-Revision-Date: 2011-08-15 13:03+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
 "ru/)\n"
@@ -44,88 +44,88 @@ msgstr "О"
 msgid "I"
 msgstr "Б"
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "Авторизация"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -138,7 +138,7 @@ msgstr "Неизвестная команда."
 msgid "Cannot send empty whispers!"
 msgstr "Нельзя отправлять пустые сообщения!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -147,97 +147,97 @@ msgstr ""
 "Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
 "уже создана, или этот игрок Вы сами."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Запрос на присоединение к каналу %s."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Не указано название группы"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "Не задано имя гильдии."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "Пожалуйста, укажите имя"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr "Enter переключает Вас на окно чата."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "Сообщение закрывает чат."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "Теперь Return переключает чат."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "Теперь сообщение закрывает чат."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
 msgstr "друг"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "пренебрегаемый"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "нейтральный"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "Игрок уже %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Игрок удачно %s!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Игрок не может быть %s!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "Игрок не был игнорируемым!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "Игрок больше не игнорируется!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
 msgstr "Игрок не может быть удален из списка игнорирования!"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
 msgstr "Игрок и так уже удален!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr "Игрок удален!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr "Игрок не может быть удален!"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -245,7 +245,7 @@ msgstr[0] "%d неделя"
 msgstr[1] "%d недели"
 msgstr[2] "%d недель"
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -253,7 +253,7 @@ msgstr[0] "%d день"
 msgstr[1] "%d дня"
 msgstr[2] "%d дней"
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -261,7 +261,7 @@ msgstr[0] "%d час"
 msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -269,7 +269,7 @@ msgstr[0] "%d минута"
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -277,27 +277,27 @@ msgstr[0] "%d секунда"
 msgstr[1] "%d секунды"
 msgstr[2] "%d секунд"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr "размер кеша шрифта"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr "Размер кеша:"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
 msgstr "Создано:"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
 msgstr "Удалено:"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr "Изображений:"
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
@@ -316,55 +316,55 @@ msgstr "Общие"
 msgid "Debug"
 msgstr "Отладка"
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr "Снимок экрана сохранен как "
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr "Группа: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr "Гильдия: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "PvP ранг: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
@@ -377,19 +377,19 @@ msgstr "Окно детектора ботов"
 msgid "Name"
 msgstr "Имя"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Атака"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Разговор"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "Движение"
 
@@ -402,8 +402,8 @@ msgid "Reset"
 msgstr "Сбросить"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "Купить"
 
@@ -417,7 +417,7 @@ msgstr "Цена: %s / Всего: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -425,20 +425,20 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Выход"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Макс"
 
@@ -447,8 +447,8 @@ msgstr "Макс"
 msgid "Shop"
 msgstr "Магазин"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -457,19 +457,19 @@ msgstr "Продать"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -635,7 +635,7 @@ msgstr "Введите пароль для удаления персонажа"
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -722,12 +722,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Чат"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутствуют: %s; Всего %d игроков."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
@@ -740,10 +740,10 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "Игнорировать"
 
@@ -889,7 +889,7 @@ msgstr "Вы знаете?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Закрыть"
 
@@ -906,7 +906,7 @@ msgid "Auto open this window"
 msgstr "Автоматически открывать это окно"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "ОК"
 
@@ -916,8 +916,8 @@ msgstr "Снаряжение"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "Снять"
 
@@ -955,31 +955,31 @@ msgid "id"
 msgstr "ид"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "Надеть"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "Использовать"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "Бросить"
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "Разделить"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
 msgstr "Наряды"
 
@@ -988,17 +988,17 @@ msgid "Weight:"
 msgstr "Вес:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "Сохранить"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Бросить"
@@ -1154,7 +1154,7 @@ msgstr "Пропустить"
 msgid "Login"
 msgstr "Вход"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Сервер:"
@@ -1179,43 +1179,43 @@ msgstr "Регистрация"
 msgid "Change Server"
 msgstr "Сменить сервер"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr "здоровье"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr "мана"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr "опыт"
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr "работа"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr "вес"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr "слоты интвентаря"
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr "деньги"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr "стрелы"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr "статус"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Нужно"
 
@@ -1236,7 +1236,7 @@ msgstr "Применить"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "Очистить"
 
@@ -1274,327 +1274,328 @@ msgstr "Сначала снять"
 msgid "Away outfit"
 msgstr "наряд отсутствия"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Торговать"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "Приват"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
 msgstr "Лечить"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
 msgstr "Подружиться"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr "Пренебречь"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr "Стереть"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr "Не игнорировать"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "@@ignore|Полностью игнорировать@@"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
 msgstr "Следовать"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr "Имитировать"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
 msgstr "Выкинуть из гильдии"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr "Сменить позицию в гильдии"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr "Пригласить в гильдию"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
 msgstr "Кикнуть игрока"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr "Уничтожить"
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
 msgstr "Показать предметы"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr "Раздеть"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
 msgstr "Добавить коментарий"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr "Кикнуть"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr "Удалить из списка атаки"
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
 msgstr "Добавить в приоритетный список"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
 msgstr "Добавить в список атаки"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Добавить имя в чат"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
 msgstr "Поднять"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "Элмент карты"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr "Удалить"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr "Прыгнуть"
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr "Загрузить старые наряды"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Заклинания"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr "Загрузить старые заклинания"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr "Изменить заклинание"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr "Не скрывать имя"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr "Скрывать имя"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
 msgstr "Рарешить режим отошел"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr "Запретить режим отошел"
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Покинуть"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "Имя:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
 msgstr "Комментарий             "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
 msgstr "Комментарий:                      "
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "Сохранить 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "Сохранить половину"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "Сохранить все"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
 msgstr "Бросить все"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
 msgstr "Получить половину"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "Получить все"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr "Загрузить старые горячие клавиши предметов"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr "Загрузить старые данные"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
 msgstr "Спрятать"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
 msgstr "Показать"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(по умолчанию)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
 msgstr "Передвинуть выше"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Сохранить состояние"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "Сменить сервер"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "Сменить персонажа"
 
@@ -1630,64 +1631,64 @@ msgstr "Пароль не должен содержать более %d симв
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Выбор сервера  *** БЕЗОПАСНЫЙ РЕЖИМ ***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
 msgstr "Использовать одинаковый IP для игровых суб-серверов"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "Тип:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "Загрузить"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "Соединиться"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "Добавить"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "Следует указать адрес и порт сервера."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Получение списка серверов...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "Подготовка к загрузке"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "Не удалось получить список серверов!"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "требуется более новая версия"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
 msgstr "требуется v%s"
@@ -1880,11 +1881,11 @@ msgstr "Синий:"
 msgid "Alpha:"
 msgstr "Прозрачность:"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "Применить"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
@@ -2189,6 +2190,10 @@ msgstr "Небезопасные символы"
 msgid "Show statuses"
 msgstr "Показывать статусы"
 
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr "Показывать ip адреса на снимках экрана"
+
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
 msgstr "Отношение"
@@ -2965,178 +2970,178 @@ msgstr "Игровые модификаторы выключены"
 msgid "Game modifiers are enabled"
 msgstr "Игровые модификаторы включены"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "Деньги: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "ОЖ:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "Мана:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "Профессия: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "Профессия:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "Очки персонажа: %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Уровень: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr "Очков навыков: %d"
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
 msgstr "(O)"
 
@@ -3272,33 +3277,33 @@ msgstr "У вас недостаточно денег"
 msgid "Name: %s"
 msgstr "Имя: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "Обновление..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "Играть"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процесс обновления не завершен!"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настоятельно рекомендуется"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr "##1  попытаться еще раз немного погодя."
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "Завершено"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dd1c670d4..e2b281bb8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:47+0000\n"
+"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"PO-Revision-Date: 2011-08-15 13:02+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -20,108 +20,108 @@ msgstr ""
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
-msgstr ""
+msgstr "在地图上可见"
 
 #: src/being.cpp:542
 msgid "dodge"
-msgstr ""
+msgstr "躲闪"
 
 #: src/being.cpp:542
 msgid "miss"
-msgstr ""
+msgstr "小姐"
 
 #. TRANSLATORS: this away status writed in player nick
 #: src/being.cpp:1514
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
 #: src/being.cpp:1519
 msgid "I"
-msgstr ""
+msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "设置"
 
-#: src/client.cpp:908
+#: src/client.cpp:909
 msgid "Connecting to server"
-msgstr ""
+msgstr "连接到服务器"
 
-#: src/client.cpp:939
+#: src/client.cpp:940
 msgid "Logging in"
 msgstr "登录"
 
-#: src/client.cpp:972
+#: src/client.cpp:973
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1073
 msgid "Requesting characters"
 msgstr "请求字符"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1104
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1114
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1167
 msgid "Requesting registration details"
 msgstr "申请登记的详细信息"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1195
 msgid "Password changed successfully!"
-msgstr ""
+msgstr "密码成功！"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email Change"
-msgstr ""
+msgstr "电子邮件变更"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1215
 msgid "Email changed successfully!"
-msgstr ""
+msgstr "电子邮件已变更成功！"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Unregister Successful"
-msgstr ""
+msgstr "注销成功"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1236
 msgid "Farewell, come back any time..."
 msgstr "永别了，任何时候回来... ..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
+#: src/client.cpp:1918 src/client.cpp:1925
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1628
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1662 src/client.cpp:1668
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1689
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -134,154 +134,154 @@ msgstr "未知命令。"
 msgid "Cannot send empty whispers!"
 msgstr "无法发送空白密语！"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:415
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "请求加入频道%s。"
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "帮会名称缺失。"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:462
 msgid "Guild name is missing."
 msgstr "公会名称是缺少的。"
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
+#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
 msgid "Please specify a name."
 msgstr "请指定一个名称。"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:516
 msgid "Message closes chat."
 msgstr "讯息关闭聊天。"
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:527
 msgid "Return now toggles chat."
 msgstr "<回车>键现在切换聊天。"
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:533
 msgid "Message now closes chat."
 msgstr "讯息现在关闭聊天。"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:561
 msgid "friend"
-msgstr ""
+msgstr "朋友"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:566
 msgid "disregarded"
 msgstr "无视"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:571
 msgid "neutral"
 msgstr "中性"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已经%s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功%s!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:612
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:634
 msgid "Player wasn't ignored!"
 msgstr "是不能忽视的！"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:641
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽略！"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:643
 msgid "Player could not be unignored!"
-msgstr ""
+msgstr "玩家不能被忽略!"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:660
 msgid "Player already erased!"
-msgstr ""
+msgstr "玩家已经被删除!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:671
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:673
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1094
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1106
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1110
 msgid "Created:"
-msgstr ""
+msgstr "创建于："
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1112
 msgid "Deleted:"
-msgstr ""
+msgstr "删除："
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -296,60 +296,60 @@ msgstr "常规"
 
 #: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
-msgstr ""
+msgstr "调试 "
 
-#: src/game.cpp:475
+#: src/game.cpp:487
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:483
+#: src/game.cpp:495
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:523
+#: src/game.cpp:535
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:537
+#: src/game.cpp:547
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1203
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1210
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1596
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1597
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
-msgstr ""
+msgstr "团队:%s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
-msgstr ""
+msgstr "工会:%s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
-msgstr ""
+msgstr "Pvp等级: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
-msgstr ""
+msgstr "评论: %s"
 
 #: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
@@ -359,19 +359,19 @@ msgstr "机器人检查"
 msgid "Name"
 msgstr "姓名"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "攻击"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "说话"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
 msgid "Move"
 msgstr "移动"
 
@@ -384,8 +384,8 @@ msgid "Reset"
 msgstr "重置"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
 msgid "Buy"
 msgstr "购买"
 
@@ -399,7 +399,7 @@ msgstr "价格：%s / 总价：%s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
@@ -407,20 +407,20 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "退出"
 
 #: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "最大"
 
@@ -429,8 +429,8 @@ msgstr "最大"
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:92
 msgid "Sell"
@@ -439,19 +439,19 @@ msgstr "出售"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
+#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
+#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:157
 msgid "Cancel"
 msgstr "取消"
 
@@ -503,16 +503,16 @@ msgstr "先输入旧密码。"
 #: src/gui/changepassworddialog.cpp:120
 #, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr ""
+msgstr "新密码需要至少%d个字符长。"
 
 #: src/gui/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr ""
+msgstr "新密码必须小于%d个字符长。"
 
 #: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
-msgstr ""
+msgstr "新的密码输入不匹配。"
 
 #: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
@@ -594,7 +594,7 @@ msgstr "帐号和角色管理"
 
 #: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
-msgstr "q登录"
+msgstr "登录"
 
 #: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
@@ -603,21 +603,21 @@ msgstr "注销"
 
 #: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr ""
+msgstr "变更电子邮件"
 
 #: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
-msgstr ""
+msgstr "不正确的密码"
 
 #: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
-msgstr ""
+msgstr "删除字符输入的密码"
 
 #: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
-msgstr ""
+msgstr "输入密码："
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
@@ -630,11 +630,11 @@ msgstr "选择"
 #: src/gui/charselectdialog.cpp:470
 #, c-format
 msgid "Level %d"
-msgstr ""
+msgstr "等级 %d"
 
 #: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
-msgstr ""
+msgstr "()"
 
 #: src/gui/chatwindow.cpp:112
 msgid "default"
@@ -704,12 +704,12 @@ msgstr "？？？"
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:606
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:993
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -722,10 +722,10 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:640
 msgid "Ignore"
 msgstr "忽略"
 
@@ -779,12 +779,12 @@ msgstr "地图演员数："
 #: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
 msgid "%d FPS (Software)"
-msgstr ""
+msgstr "%d FPS (软件)"
 
 #: src/gui/debugwindow.cpp:166
 #, c-format
 msgid "%d FPS (fast OpenGL)"
-msgstr ""
+msgstr "%d的FPS (快速 OpenGL)"
 
 #: src/gui/debugwindow.cpp:169
 #, c-format
@@ -823,17 +823,17 @@ msgstr "目标水平："
 #: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
 #: src/gui/debugwindow.cpp:346
 msgid "Target Party:"
-msgstr ""
+msgstr "目标："
 
 #: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
 #: src/gui/debugwindow.cpp:347
 msgid "Target Guild:"
-msgstr ""
+msgstr "目标公会："
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
 #: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
 msgid "Attack delay:"
-msgstr ""
+msgstr "攻击延迟："
 
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
 #: src/gui/debugwindow.cpp:349
@@ -858,7 +858,7 @@ msgstr ""
 #: src/gui/debugwindow.cpp:393
 #, c-format
 msgid "In: %d bytes/s"
-msgstr ""
+msgstr "输入:%d 字节/"
 
 #: src/gui/debugwindow.cpp:395
 #, c-format
@@ -867,28 +867,28 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:47
 msgid "Did You Know?"
-msgstr ""
+msgstr "你知道吗？"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "关闭"
 
 #: src/gui/didyouknowwindow.cpp:62
 msgid "< Previous"
-msgstr ""
+msgstr "<上一页"
 
 #: src/gui/didyouknowwindow.cpp:63
 msgid "Next >"
-msgstr ""
+msgstr "下一页>"
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "Auto open this window"
-msgstr ""
+msgstr "自动打开这个窗口"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "确定"
 
@@ -898,8 +898,8 @@ msgstr "装备"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
+#: src/gui/popupmenu.cpp:1783
 msgid "Unequip"
 msgstr "卸下装备"
 
@@ -918,7 +918,7 @@ msgstr "槽："
 
 #: src/gui/inventorywindow.cpp:115
 msgid "Filter:"
-msgstr ""
+msgstr "过滤器："
 
 #: src/gui/inventorywindow.cpp:116
 msgid "Sort:"
@@ -937,50 +937,50 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
 msgid "Equip"
 msgstr "装备"
 
 #: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
+#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
+#: src/gui/popupmenu.cpp:1788
 msgid "Use"
 msgstr "使用"
 
 #: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1792
 msgid "Drop..."
 msgstr "掉落... ..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
 msgid "Split"
 msgstr "分离"
 
 #: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:520
 msgid "Outfits"
-msgstr ""
+msgstr "装具"
 
 #: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "重量："
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "丢弃"
@@ -1023,7 +1023,7 @@ msgstr "未知。"
 
 #: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
-msgstr ""
+msgstr ","
 
 #: src/gui/itempopup.cpp:192
 #, c-format
@@ -1036,7 +1036,7 @@ msgstr "杀敌统计"
 
 #: src/gui/killstats.cpp:64
 msgid "Reset stats"
-msgstr ""
+msgstr "复位统计"
 
 #: src/gui/killstats.cpp:65
 msgid "Reset timer"
@@ -1045,7 +1045,7 @@ msgstr "复位定时器"
 #: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
-msgstr ""
+msgstr "等级:%d 在 %f%%"
 
 #: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
@@ -1092,7 +1092,7 @@ msgstr[0] ""
 
 #: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
-msgstr ""
+msgstr "最后EXP："
 
 #: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
 #: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
@@ -1110,7 +1110,7 @@ msgstr ""
 #: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
-msgstr ""
+msgstr "%s %d?"
 
 #: src/gui/killstats.cpp:367
 msgid "jacko spawning"
@@ -1132,7 +1132,7 @@ msgstr "跳过"
 msgid "Login"
 msgstr "登录"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "服务器："
@@ -1157,43 +1157,43 @@ msgstr "注册"
 msgid "Change Server"
 msgstr "更改服务器"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
-msgstr ""
+msgstr "法力栏"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
-msgstr ""
+msgstr "重量栏"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
-msgstr ""
+msgstr "钱栏"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
-msgstr ""
+msgstr "状态栏"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "需要"
 
@@ -1214,7 +1214,7 @@ msgstr "提交"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
 msgid "Clear"
 msgstr "清除"
 
@@ -1252,327 +1252,328 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
 msgid "Whisper"
 msgstr "密语"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
 msgid "Heal"
-msgstr ""
+msgstr "愈合"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:628
 msgid "Be friend"
-msgstr ""
+msgstr "是朋友"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:662
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:660
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
+#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "完全忽略"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:672
 msgid "Follow"
-msgstr ""
+msgstr "按照"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:673
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:715
 msgid "Kick from party"
-msgstr ""
+msgstr "踢从党"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:729
 msgid "Kick from guild"
-msgstr ""
+msgstr "踢从公会"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
+#: src/gui/popupmenu.cpp:731
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:737
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:242
 msgid "Kick player"
-msgstr ""
+msgstr "踢球员"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:244
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
 msgid "Show Items"
-msgstr ""
+msgstr "显示项目"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:1970
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:746
 msgid "Add comment"
-msgstr ""
+msgstr "发表评论"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
-msgstr ""
+msgstr "购买(?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
-msgstr ""
+msgstr "出售(?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:298
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315
 msgid "Add to priority attack list"
-msgstr ""
+msgstr "优先攻击列表"
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:317
 msgid "Add to attack list"
-msgstr ""
+msgstr "加入攻击清单"
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:320
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:483
 msgid "Pick up"
-msgstr ""
+msgstr "拾取"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
 msgid "Add to chat"
 msgstr "加入聊天"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:501
 msgid "Map Item"
 msgstr "地图项"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:502
 msgid "Rename"
-msgstr ""
+msgstr "重命名"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:508
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "法术"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:540
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:541
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:567
 msgid "Disable highlight"
 msgstr "禁用"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:572
 msgid "Enable highlight"
 msgstr "启用突出"
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:582
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:587
 msgid "Enable away"
-msgstr ""
+msgstr "启用远"
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:592
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "留下"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:758
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1189
 msgid "Rename map sign          "
 msgstr "重命名的地图标志"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1191
 msgid "Name:                    "
 msgstr "名称："
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1241
 msgid "Player comment            "
-msgstr ""
+msgstr "玩家评论"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1243
 msgid "Comment:                      "
-msgstr ""
+msgstr "评论："
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1607
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1613
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1630
 msgid "Store 10"
 msgstr "商店10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1633
 msgid "Store half"
 msgstr "商店的一半"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1635
 msgid "Store all"
 msgstr "商店所有"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
-msgstr ""
+msgstr "所有"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
-msgstr ""
+msgstr "拿出10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1677
 msgid "Retrieve half"
-msgstr "找回一半"
+msgstr "拿出一半"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1679
 msgid "Retrieve all"
 msgstr "检索所有"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1809
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
-msgstr ""
+msgstr "隐藏"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
-msgstr ""
+msgstr "显示"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
-msgstr ""
+msgstr "(默认)"
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
-msgstr ""
+msgstr "x"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
 msgstr ""
 
 #: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "保存状态"
-
-#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "交换服务器"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:57
 msgid "Switch character"
 msgstr "交换角色"
 
@@ -1608,67 +1609,67 @@ msgstr "密码不能少于%d个字符。"
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "选择您的服务器"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr ""
+msgstr "选择你的服务器***安全模式***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:247
 msgid "Port:"
 msgstr "端口："
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:251
 msgid "Use same ip for game sub servers"
-msgstr ""
+msgstr "游戏分服务器使用相同的IP"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:265
 msgid "Server type:"
 msgstr "服务器类型："
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:289
 msgid "Load"
 msgstr "负载"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:290
 msgid "Connect"
 msgstr "连接"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:291
 msgid "Custom Server"
 msgstr "自定义服务器"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:396
 msgid "Please type both the address and the port of a server."
 msgstr "请输入服务器的IP地址和端口"
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:554
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "下载服务器列表...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:559
 msgid "Waiting for server..."
 msgstr "等待服务器..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:563
 msgid "Preparing download"
 msgstr "准备下载"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:567
 msgid "Error retreiving server list!"
 msgstr "错误retreiving的服务器列表！"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:672
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:674
 #, c-format
 msgid "requires v%s"
-msgstr ""
+msgstr "需要 v%s"
 
 #: src/gui/setup_audio.cpp:50
 msgid "Enable Audio"
@@ -1708,7 +1709,7 @@ msgstr "音乐声量"
 
 #: src/gui/setup_audio.cpp:120
 msgid "Notice"
-msgstr ""
+msgstr "公告"
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
@@ -1724,23 +1725,23 @@ msgstr "颜色"
 
 #: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
-msgstr ""
+msgstr "从收到的聊天消息中删除颜色"
 
 #: src/gui/setup_chat.cpp:60
 msgid "Show chat colors list"
-msgstr ""
+msgstr "显示聊天颜色列表"
 
 #: src/gui/setup_chat.cpp:64
 msgid "Commands"
-msgstr ""
+msgstr "命令"
 
 #: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr ""
+msgstr "允许在所有聊天标签中使用魔法和GM命令"
 
 #: src/gui/setup_chat.cpp:70
 msgid "Limits"
-msgstr ""
+msgstr "限制"
 
 #: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
@@ -1748,11 +1749,11 @@ msgstr ""
 
 #: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
-msgstr ""
+msgstr "限制聊天的最大"
 
 #: src/gui/setup_chat.cpp:79
 msgid "Logs"
-msgstr ""
+msgstr "日志"
 
 #: src/gui/setup_chat.cpp:81
 msgid "Enable chat Log"
@@ -1760,19 +1761,19 @@ msgstr "启用聊天记录"
 
 #: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
-msgstr ""
+msgstr "显示聊天记录"
 
 #: src/gui/setup_chat.cpp:88
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
-msgstr ""
+msgstr "隐藏商店的消息"
 
 #: src/gui/setup_chat.cpp:94
 msgid "Tabs"
-msgstr ""
+msgstr "标签"
 
 #: src/gui/setup_chat.cpp:96
 msgid "Put all whispers in tabs"
@@ -1804,11 +1805,11 @@ msgstr ""
 
 #: src/gui/setup_chat.cpp:118
 msgid "Time"
-msgstr ""
+msgstr "时间"
 
 #: src/gui/setup_chat.cpp:120
 msgid "Use local time"
-msgstr ""
+msgstr "使用本地时间"
 
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
@@ -1816,7 +1817,7 @@ msgstr "这就是该色彩看起来的样子"
 
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
-msgstr ""
+msgstr "类型:"
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
@@ -1855,19 +1856,19 @@ msgstr "蓝色："
 
 #: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
-msgstr ""
+msgstr "阿尔法："
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Apply"
 msgstr "应用"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "重置窗口"
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
 msgid "Edit"
-msgstr ""
+msgstr "编辑"
 
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
@@ -1915,7 +1916,7 @@ msgstr "检测到按键冲突。"
 
 #: src/gui/setup_other.cpp:40
 msgid "Misc"
-msgstr ""
+msgstr "杂项"
 
 #: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
 msgid "Monsters"
@@ -1927,7 +1928,7 @@ msgstr "显示损坏造成的，以怪物"
 
 #: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
-msgstr ""
+msgstr "自动目标只有到达怪物"
 
 #: src/gui/setup_other.cpp:54
 msgid "Highlight monster attack range"
@@ -1971,7 +1972,7 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:89
 msgid "Moving"
-msgstr ""
+msgstr "移动"
 
 #: src/gui/setup_other.cpp:91
 msgid "Auto fix position"
@@ -1979,7 +1980,7 @@ msgstr "自动修复的位置"
 
 #: src/gui/setup_other.cpp:94
 msgid "Attack while moving"
-msgstr ""
+msgstr "攻击的同时移动"
 
 #: src/gui/setup_other.cpp:97
 msgid "Sync player move"
@@ -2007,11 +2008,11 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:115
 msgid "Show job exp messages"
-msgstr ""
+msgstr "显示工作EXP消息"
 
 #: src/gui/setup_other.cpp:118
 msgid "Show players popups"
-msgstr ""
+msgstr "显示球员弹出窗口"
 
 #: src/gui/setup_other.cpp:121
 msgid "Afk message"
@@ -2023,7 +2024,7 @@ msgstr "显示工作"
 
 #: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
-msgstr ""
+msgstr "启用攻击过滤器"
 
 #: src/gui/setup_other.cpp:130
 msgid "Enable advert protocol"
@@ -2035,7 +2036,7 @@ msgstr "接受出售/购买请求"
 
 #: src/gui/setup_other.cpp:139
 msgid "Enable shop mode"
-msgstr ""
+msgstr "启用店模式"
 
 #: src/gui/setup_other.cpp:145
 msgid "Log NPC dialogue"
@@ -2043,11 +2044,11 @@ msgstr "NPC对话"
 
 #: src/gui/setup_other.cpp:149
 msgid "Other"
-msgstr ""
+msgstr "其他"
 
 #: src/gui/setup_other.cpp:151
 msgid "Enable server side attack"
-msgstr ""
+msgstr "启用服务器端的攻击"
 
 #: src/gui/setup_other.cpp:154
 msgid "Enable bot checker"
@@ -2055,7 +2056,7 @@ msgstr "启用BOT检查"
 
 #: src/gui/setup_other.cpp:157
 msgid "Enable buggy servers protection"
-msgstr ""
+msgstr "启用BUG保护"
 
 #: src/gui/setup_other.cpp:160
 msgid "Enable debug log"
@@ -2071,11 +2072,11 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:169
 msgid "Show background"
-msgstr ""
+msgstr "显示背景"
 
 #: src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
-msgstr ""
+msgstr "Perfomance"
 
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
@@ -2083,7 +2084,7 @@ msgstr ""
 
 #: src/gui/setup_perfomance.cpp:58
 msgid "Auto adjust perfomance"
-msgstr ""
+msgstr "自动调整"
 
 #: src/gui/setup_perfomance.cpp:61
 msgid "Show beings transparency"
@@ -2131,7 +2132,7 @@ msgstr "玩家"
 
 #: src/gui/setup_players.cpp:54
 msgid "Show gender"
-msgstr ""
+msgstr "显示性别"
 
 #: src/gui/setup_players.cpp:57
 msgid "Show level"
@@ -2159,6 +2160,10 @@ msgstr ""
 
 #: src/gui/setup_players.cpp:75
 msgid "Show statuses"
+msgstr "显示状态"
+
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
 msgstr ""
 
 #: src/gui/setup_relations.cpp:65
@@ -2195,11 +2200,11 @@ msgstr "允许密语"
 
 #: src/gui/setup_relations.cpp:244
 msgid "Old"
-msgstr ""
+msgstr "旧"
 
 #: src/gui/setup_relations.cpp:246
 msgid "Relations"
-msgstr ""
+msgstr "关系"
 
 #: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
@@ -2346,7 +2351,7 @@ msgstr "作为发射武器"
 
 #: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr ""
+msgstr "FPS限制："
 
 #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
 #: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
@@ -2371,18 +2376,18 @@ msgstr "环境音效"
 
 #: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr ""
+msgstr "l"
 
 #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
 #: src/gui/setup_video.cpp:707
 msgid "None"
-msgstr ""
+msgstr "w"
 
 #: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
+msgstr "切换到窗口模式，并恢复旧的模式，也没有失败！"
 
 #: src/gui/setup_video.cpp:490
 msgid ""
@@ -2391,7 +2396,7 @@ msgstr ""
 
 #: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr ""
+msgstr "切换到全屏"
 
 #: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
@@ -2399,7 +2404,7 @@ msgstr "重启生效"
 
 #: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr ""
+msgstr "切换到OpenGL"
 
 #: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
@@ -2415,7 +2420,7 @@ msgstr "输入新的分辨率:"
 
 #: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
-msgstr ""
+msgstr "屏幕分辨率已更改"
 
 #: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
@@ -2423,7 +2428,7 @@ msgstr ""
 
 #: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr ""
+msgstr "粒子效果更改的设置。"
 
 #: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
@@ -2431,7 +2436,7 @@ msgstr "变更会在地图更换时生效。"
 
 #: src/gui/shopwindow.cpp:74
 msgid "Personal Shop"
-msgstr ""
+msgstr "个人商店"
 
 #: src/gui/shopwindow.cpp:116
 msgid "Buy items"
@@ -2448,11 +2453,11 @@ msgstr "添加"
 
 #: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
 msgid "Announce"
-msgstr ""
+msgstr "公布"
 
 #: src/gui/shopwindow.cpp:125
 msgid "Show links in announce"
-msgstr ""
+msgstr "显示在公布的联系"
 
 #: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
 #: src/net/manaserv/tradehandler.cpp:127
@@ -2462,7 +2467,7 @@ msgstr "请求交易"
 #: src/gui/shopwindow.cpp:724
 #, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr ""
+msgstr "%s想要%s %s 你接受吗？"
 
 #: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
@@ -2518,7 +2523,7 @@ msgstr "会员邀请到公会"
 #: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
-msgstr ""
+msgstr "你要邀请谁加入工会%s?"
 
 #: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
@@ -2527,11 +2532,11 @@ msgstr "离开公会？"
 #: src/gui/socialwindow.cpp:198
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr ""
+msgstr "你确定要离开工会%s吗？"
 
 #: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
-msgstr "帮会"
+msgstr "t"
 
 #: src/gui/socialwindow.cpp:243
 #, c-format
@@ -2554,7 +2559,7 @@ msgstr ""
 
 #: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
-msgstr ""
+msgstr "离开团队?"
 
 #: src/gui/socialwindow.cpp:295
 #, c-format
@@ -2575,7 +2580,7 @@ msgstr ""
 
 #: src/gui/socialwindow.cpp:872
 msgid "Attack mobs"
-msgstr ""
+msgstr "攻击暴徒"
 
 #: src/gui/socialwindow.cpp:907
 msgid "Ignore mobs"
@@ -2587,7 +2592,7 @@ msgstr "创建帮会"
 
 #: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "建立党"
+msgstr "建立"
 
 #: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
@@ -2753,7 +2758,7 @@ msgstr ""
 
 #: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
-msgstr ""
+msgstr "(?)移动到目标"
 
 #: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
@@ -2789,11 +2794,11 @@ msgstr ""
 
 #: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
-msgstr ""
+msgstr "(?) 攻击"
 
 #: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
-msgstr ""
+msgstr "(G) 去攻击"
 
 #: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
@@ -2833,7 +2838,7 @@ msgstr ""
 
 #: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
-msgstr ""
+msgstr "(?)拿起"
 
 #: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
@@ -2931,180 +2936,180 @@ msgstr ""
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
+#: src/gui/statuswindow.cpp:335
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
+#: src/gui/statuswindow.cpp:302
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:149
 msgid "HP:"
 msgstr "HP："
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:156
 msgid "Exp:"
 msgstr "经验："
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:170
 msgid "MP:"
 msgstr "MP："
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
 #, c-format
 msgid "Job: %d"
 msgstr "职业：%d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:203
 msgid "Job:"
 msgstr "职业："
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
 #, c-format
 msgid "Character points: %d"
 msgstr "角色可用点: %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:267
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "级别:%d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:323
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
+#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
+#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
-msgstr ""
+msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
-msgstr ""
+msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
-msgstr ""
+msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:655
 msgid "(C)"
-msgstr ""
+msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgstr "(d)"
+
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
+#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
+#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
-msgstr ""
+msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:672
 msgid "(a)"
-msgstr ""
+msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:683
 msgid "(0)"
-msgstr ""
+msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:686
 msgid "(1)"
-msgstr ""
+msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:689
 msgid "(2)"
-msgstr ""
+msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
-msgstr ""
+msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:695
 msgid "(5)"
-msgstr ""
+msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:698
 msgid "(7)"
-msgstr ""
+msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
-msgstr ""
+msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:714
 msgid "(R)"
-msgstr ""
+msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:717
 msgid "(M)"
-msgstr ""
+msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:720
 msgid "(P)"
-msgstr ""
+msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:734
 msgid "(s)"
-msgstr ""
+msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
-msgstr ""
+msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
+#: src/gui/statuswindow.cpp:858
 msgid "(G)"
-msgstr ""
+msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:766
 msgid "(f)"
-msgstr ""
+msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:861
 msgid "(F)"
-msgstr ""
+msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
-msgstr ""
+msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:802
 msgid "(g)"
-msgstr ""
+msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:819
 msgid "(N)"
-msgstr ""
+msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:825
 msgid "(u)"
-msgstr ""
+msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:831
 msgid "(e)"
-msgstr ""
+msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:834
 msgid "(b)"
-msgstr ""
+msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
-msgstr ""
+msgstr "(O)"
 
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
@@ -3128,15 +3133,15 @@ msgstr "生活魔术"
 
 #: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr ""
+msgstr "战魔"
 
 #: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
-msgstr ""
+msgstr "蜕变魔术"
 
 #: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
-msgstr ""
+msgstr "大自然的神奇"
 
 #: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
@@ -3237,33 +3242,33 @@ msgstr "你没有足够的钱币."
 msgid "Name: %s"
 msgstr "姓名：%s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:136
 msgid "Updating..."
 msgstr "更新..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:155
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:158
 msgid "Play"
 msgstr "开始"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:686
 msgid "Completed"
 msgstr "已完成"
 
@@ -3277,7 +3282,7 @@ msgstr ""
 
 #: src/gui/userpalette.cpp:118
 msgid "Disregarded Names"
-msgstr ""
+msgstr "豁免计算名称"
 
 #: src/gui/userpalette.cpp:119
 msgid "Ignored Names"
@@ -3313,7 +3318,7 @@ msgstr "怪物的HP指示栏(第二个颜色)"
 
 #: src/gui/userpalette.cpp:129
 msgid "Party Members"
-msgstr ""
+msgstr "党的议员"
 
 #: src/gui/userpalette.cpp:130
 msgid "Guild Members"
@@ -3401,7 +3406,7 @@ msgstr ""
 
 #: src/gui/userpalette.cpp:163
 msgid "Monster Attack Range"
-msgstr ""
+msgstr "怪物攻击范围"
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
@@ -3433,11 +3438,11 @@ msgstr "谁在线 - 错误"
 
 #: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
-msgstr ""
+msgstr "谁在线 - 更新"
 
 #: src/gui/widgets/battletab.cpp:45
 msgid "Battle"
-msgstr ""
+msgstr "战斗"
 
 #: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
@@ -3577,7 +3582,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:65
 msgid "Bot checker"
-msgstr ""
+msgstr "机器人检查"
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
@@ -3585,7 +3590,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:67
 msgid "Who is online"
-msgstr ""
+msgstr "谁在线"
 
 #: src/gui/windowmenu.cpp:69
 msgid "KS"
@@ -3593,7 +3598,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:71
 msgid "Smilies"
-msgstr ""
+msgstr "表情符号"
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
@@ -3820,7 +3825,7 @@ msgstr "Debug窗口"
 
 #: src/keyboardconfig.cpp:142
 msgid "Social Window"
-msgstr ""
+msgstr "社会窗口"
 
 #: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
@@ -3840,7 +3845,7 @@ msgstr "快速下拉窗口"
 
 #: src/keyboardconfig.cpp:152
 msgid "Kill Stats Window"
-msgstr ""
+msgstr "杀敌统计窗口"
 
 #: src/keyboardconfig.cpp:154
 msgid "Commands Window"
@@ -3852,7 +3857,7 @@ msgstr "BOT检查窗口"
 
 #: src/keyboardconfig.cpp:159
 msgid "Who Is Online Window"
-msgstr ""
+msgstr "谁是在线窗口"
 
 #: src/keyboardconfig.cpp:161
 msgid "Did you know Window"
@@ -3860,7 +3865,7 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:164
 msgid "Previous Social Tab"
-msgstr ""
+msgstr "上一页社会标签"
 
 #: src/keyboardconfig.cpp:166
 msgid "Next Social Tab"
@@ -3927,7 +3932,7 @@ msgstr "下一个聊天窗口标签页"
 
 #: src/keyboardconfig.cpp:278
 msgid "Close current Chat Tab"
-msgstr ""
+msgstr "关闭当前聊天标签"
 
 #: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
@@ -4003,7 +4008,7 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:315
 msgid "Use magic attack"
-msgstr ""
+msgstr "使用魔法攻击"
 
 #: src/keyboardconfig.cpp:317
 msgid "Switch magic attack"
@@ -4039,7 +4044,7 @@ msgstr "开/关 音频"
 
 #: src/keyboardconfig.cpp:333
 msgid "Enable / Disable away mode"
-msgstr ""
+msgstr "启用/禁用离开模式"
 
 #: src/keyboardconfig.cpp:335
 msgid "Emulate right click from keyboard"
@@ -4070,11 +4075,11 @@ msgstr ""
 
 #: src/localplayer.cpp:1404
 msgid "Item is too heavy."
-msgstr ""
+msgstr "项目是太重了。"
 
 #: src/localplayer.cpp:1406
 msgid "Item is too far away."
-msgstr ""
+msgstr "物品太远了。"
 
 #: src/localplayer.cpp:1408
 msgid "Inventory is full."
@@ -4098,15 +4103,15 @@ msgstr ""
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] ""
+msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
 #: src/localplayer.cpp:3174
 msgid "Away"
-msgstr ""
+msgstr "距离"
 
 #: src/localplayer.cpp:3478
 msgid "Follow: "
-msgstr ""
+msgstr "跟随:"
 
 #: src/localplayer.cpp:3480 src/localplayer.cpp:3495
 msgid "Follow canceled"
@@ -4126,15 +4131,15 @@ msgstr "你看"
 
 #: src/main.cpp:47
 msgid "manaplus [options] [mana-file]"
-msgstr ""
+msgstr "manaplus [选项] [mana-file]"
 
 #: src/main.cpp:48
 msgid "[mana-file] : The mana file is an XML file (.mana)"
-msgstr ""
+msgstr "[mana-file] : The mana is an XML file (.mana)"
 
 #: src/main.cpp:49
 msgid "              used to set custom parameters"
-msgstr ""
+msgstr "用于设置自定义参数"
 
 #: src/main.cpp:50
 msgid "              to the manaplus client."
@@ -4146,7 +4151,7 @@ msgstr "选项："
 
 #: src/main.cpp:53
 msgid "  -l --log-file       : Log file to use"
-msgstr ""
+msgstr "-l--log-file 日志文件"
 
 #: src/main.cpp:54
 msgid "  -L --chat-log-dir   : Chat log dir to use"
@@ -4154,7 +4159,7 @@ msgstr ""
 
 #: src/main.cpp:55
 msgid "  -v --version        : Display the version"
-msgstr ""
+msgstr "-v --version: 显示版本"
 
 #: src/main.cpp:56
 msgid "  -h --help           : Display this help"
@@ -4254,7 +4259,7 @@ msgstr "幸运："
 
 #: src/net/ea/charserverhandler.cpp:102
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
+msgstr "访问被拒绝。最有可能的，也有太多的球员，在此服务器上。"
 
 #: src/net/ea/charserverhandler.cpp:106
 msgid "Cannot use this ID."
@@ -4270,15 +4275,15 @@ msgstr "创建角色失败。很可能名称已被占用。"
 
 #: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
 msgid "Wrong name."
-msgstr ""
+msgstr "错误的名称。"
 
 #: src/net/ea/charserverhandler.cpp:145
 msgid "Incorrect stats."
-msgstr ""
+msgstr "不正确的统计。"
 
 #: src/net/ea/charserverhandler.cpp:148
 msgid "Incorrect hair."
-msgstr ""
+msgstr "不正确的头发。"
 
 #: src/net/ea/charserverhandler.cpp:151
 msgid "Incorrect slot."
@@ -4306,7 +4311,7 @@ msgstr "聊天频道不被支持！"
 #: src/net/ea/chathandler.cpp:128
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
-msgstr ""
+msgstr "密语无法发送，%s离线。"
 
 #: src/net/ea/chathandler.cpp:136
 #, c-format
@@ -4315,20 +4320,20 @@ msgstr ""
 
 #: src/net/ea/chathandler.cpp:348
 msgid "MVP player."
-msgstr ""
+msgstr "MVP球员。"
 
 #: src/net/ea/chathandler.cpp:352
 msgid "MVP player: "
-msgstr ""
+msgstr "MVP球员："
 
 #: src/net/ea/gamehandler.cpp:86
 #, c-format
 msgid "Online users: %d"
-msgstr ""
+msgstr "在线用户数：%d"
 
 #: src/net/ea/gamehandler.cpp:98
 msgid "Game"
-msgstr ""
+msgstr "游戏"
 
 #: src/net/ea/gamehandler.cpp:98
 msgid "Request to quit denied!"
@@ -4356,15 +4361,15 @@ msgstr "/help > 显示该帮助信息。"
 
 #: src/net/ea/gui/guildtab.cpp:136
 msgid "/invite > Invite a player to your guild"
-msgstr ""
+msgstr "/invite > "
 
 #: src/net/ea/gui/guildtab.cpp:137
 msgid "/leave > Leave the guild you are in"
-msgstr ""
+msgstr "/leave > "
 
 #: src/net/ea/gui/guildtab.cpp:138
 msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
+msgstr "/kick >"
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
 msgid "Guild created."
@@ -4372,7 +4377,7 @@ msgstr "帮会已创建"
 
 #: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
 msgid "You are already in guild."
-msgstr ""
+msgstr "您已经在公会。"
 
 #: src/net/ea/guildhandler.cpp:98
 msgid "Emperium check failed."
@@ -4380,7 +4385,7 @@ msgstr ""
 
 #: src/net/ea/guildhandler.cpp:103
 msgid "Unknown server response."
-msgstr ""
+msgstr "未知的服务器的响应。"
 
 #: src/net/ea/guildhandler.cpp:180
 #, c-format
@@ -4390,37 +4395,37 @@ msgstr ""
 #: src/net/ea/guildhandler.cpp:182
 #, c-format
 msgid "Guild master: %s"
-msgstr ""
+msgstr "工会会长: %s"
 
 #: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
-msgstr ""
+msgstr "工会等级: %d"
 
 #: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
-msgstr ""
+msgstr "在线玩家: %d"
 
 #: src/net/ea/guildhandler.cpp:188
 #, c-format
 msgid "Max members: %d"
-msgstr ""
+msgstr "最大成员: %d"
 
 #: src/net/ea/guildhandler.cpp:190
 #, c-format
 msgid "Average level: %d"
-msgstr ""
+msgstr "平均等级: %d"
 
 #: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild exp: %d"
-msgstr ""
+msgstr "工会经验值: %d"
 
 #: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild next exp: %d"
-msgstr ""
+msgstr "工会下一级所需经验: %d"
 
 #: src/net/ea/guildhandler.cpp:196
 #, c-format
@@ -4437,7 +4442,7 @@ msgstr ""
 
 #: src/net/ea/guildhandler.cpp:410
 msgid "User is now part of your guild."
-msgstr ""
+msgstr "用户现在是你们的工会成员了."
 
 #: src/net/ea/guildhandler.cpp:414
 msgid "Your guild is full."
@@ -4445,25 +4450,25 @@ msgstr ""
 
 #: src/net/ea/guildhandler.cpp:418
 msgid "Unknown guild invite response."
-msgstr ""
+msgstr "未知工会邀请响应."
 
 #: src/net/ea/guildhandler.cpp:438
 msgid "You have left the guild."
-msgstr ""
+msgstr "你已经离开工会."
 
 #: src/net/ea/guildhandler.cpp:452
 #, c-format
 msgid "%s has left your guild."
-msgstr ""
+msgstr "%s已经离开工会."
 
 #: src/net/ea/guildhandler.cpp:483
 msgid "You was kicked from guild."
-msgstr ""
+msgstr "你已经被工会开除！."
 
 #: src/net/ea/guildhandler.cpp:496
 #, c-format
 msgid "%s has kicked from your guild."
-msgstr ""
+msgstr "%s已经被工会开除."
 
 #: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
@@ -4505,7 +4510,7 @@ msgstr "改命令改变帮会的物品共享策略。"
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
-msgstr "<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\",\"false\"用来禁止物品共享。"
+msgstr "<策略>可以为“1”，“yes”，“true”其中一以开启物品共享，或者 是\"0\",\"no\",\"false\"用来禁止物品共享。"
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4587,7 +4592,7 @@ msgstr "旧密码不正确。"
 
 #: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr ""
+msgstr "新密码太短。"
 
 #: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
@@ -4598,15 +4603,15 @@ msgstr "未知的错误。"
 
 #: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr ""
+msgstr "未注册的ID。"
 
 #: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr ""
+msgstr "错误的密码。"
 
 #: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
-msgstr ""
+msgstr "账户过期失效。"
 
 #: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
@@ -4615,11 +4620,11 @@ msgstr ""
 #: src/net/ea/loginhandler.cpp:217
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
+msgstr "您已被永久禁止进入游戏。请联系GM团队。"
 
 #: src/net/ea/loginhandler.cpp:221
 msgid "Client too old."
-msgstr ""
+msgstr "客户端太旧。"
 
 #: src/net/ea/loginhandler.cpp:224
 #, c-format
@@ -4653,7 +4658,7 @@ msgstr "帮会创建成功。"
 #: src/net/ea/partyhandler.cpp:140
 #, c-format
 msgid "%s has joined your party."
-msgstr ""
+msgstr "%s已经加入你的党。"
 
 #: src/net/ea/partyhandler.cpp:176
 #, c-format
@@ -4673,7 +4678,7 @@ msgstr "%s现在是你帮会中的成员了。"
 #: src/net/ea/partyhandler.cpp:191
 #, c-format
 msgid "%s can't join your party because party is full."
-msgstr ""
+msgstr "%s不能加入团队，因为团队成员已满。"
 
 #: src/net/ea/partyhandler.cpp:196
 #, c-format
@@ -4827,16 +4832,16 @@ msgstr ""
 #: src/net/ea/playerhandler.cpp:451
 #, c-format
 msgid "You picked up %s."
-msgstr ""
+msgstr "你捡起了%s"
 
 #: src/net/ea/playerhandler.cpp:457
 #, c-format
 msgid "You spent %s."
-msgstr ""
+msgstr "你花费 %s."
 
 #: src/net/ea/playerhandler.cpp:501
 msgid "Cannot raise skill!"
-msgstr ""
+msgstr "不能提升技能!"
 
 #: src/net/ea/playerhandler.cpp:618
 msgid "Equip arrows first."
@@ -4963,7 +4968,7 @@ msgstr "添加项目失败。交易伙伴无空闲槽存放物品。"
 
 #: src/net/ea/tradehandler.cpp:241
 msgid "Failed adding item. You can't trade this item."
-msgstr ""
+msgstr "添加物品失败。您不能交易这项物品."
 
 #: src/net/ea/tradehandler.cpp:245
 msgid "Failed adding item for unknown reason."
@@ -5090,12 +5095,12 @@ msgstr "删除。"
 
 #: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr ""
+msgstr "范围。"
 
 #: src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
-msgstr ""
+msgstr "未知错误(%d)"
 
 #: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
@@ -5109,15 +5114,15 @@ msgstr "主题：%s"
 
 #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
-msgstr ""
+msgstr "玩家在此通道："
 
 #: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr ""
+msgstr "加入通道时发生错误。"
 
 #: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
-msgstr ""
+msgstr "上市渠道。"
 
 #: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
@@ -5339,7 +5344,7 @@ msgstr "重复登录。"
 
 #: src/net/tmwa/generalhandler.cpp:159
 msgid "Unknown connection error."
-msgstr ""
+msgstr "未知的连接错误。"
 
 #: src/net/tmwa/generalhandler.cpp:232
 msgid "Got disconnected from server!"
@@ -5394,7 +5399,7 @@ msgstr "空的地址给网络：连接（）！"
 
 #: src/net/tmwa/network.cpp:356
 msgid "Unable to resolve host \""
-msgstr ""
+msgstr "无法解析主机“"
 
 #: src/net/tmwa/network.cpp:426
 msgid "Connection to server terminated. "
@@ -5419,7 +5424,7 @@ msgstr ""
 
 #: src/playerrelations.cpp:481
 msgid "Floating bubble"
-msgstr ""
+msgstr "流动的泡沫"
 
 #: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
 #: src/resources/monsterdb.cpp:84
-- 
cgit v1.2.3-70-g09d2


From 35cf98e57d4dc37ec421288cbe1840ca8fcc3547 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 16 Aug 2011 19:20:39 +0300
Subject: Update and rebuild translations.

---
 po/de.po        | 136 +++++++++++++++++++-------------------
 po/es.po        | 138 +++++++++++++++++++-------------------
 po/fi.po        | 136 +++++++++++++++++++-------------------
 po/fr.po        | 136 +++++++++++++++++++-------------------
 po/hr.po        | 136 +++++++++++++++++++-------------------
 po/hu.po        | 136 +++++++++++++++++++-------------------
 po/id.po        | 138 +++++++++++++++++++-------------------
 po/ja.po        | 201 +++++++++++++++++++++++++++++++-------------------------
 po/manaplus.pot | 136 +++++++++++++++++++-------------------
 po/nl_BE.po     | 138 +++++++++++++++++++-------------------
 po/pt.po        | 138 +++++++++++++++++++-------------------
 po/pt_BR.po     | 138 +++++++++++++++++++-------------------
 po/ru.po        | 138 +++++++++++++++++++-------------------
 po/zh_CN.po     | 172 +++++++++++++++++++++++++-----------------------
 14 files changed, 1045 insertions(+), 972 deletions(-)

(limited to 'po/ja.po')

diff --git a/po/de.po b/po/de.po
index 0252b06f5..310a34f6e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
@@ -109,7 +109,7 @@ msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
@@ -436,7 +436,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Geschäft"
 
@@ -705,7 +705,7 @@ msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -741,7 +741,7 @@ msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Karte"
 
@@ -1223,7 +1223,7 @@ msgid "Submit"
 msgstr "Absenden"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1881,10 +1881,6 @@ msgstr "Anwenden"
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
@@ -1929,163 +1925,163 @@ msgstr "Standard"
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monster"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Protokoliere NPC Gespräche"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr ""
 
@@ -2225,67 +2221,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "Wenn ignorierend:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
@@ -3563,6 +3563,10 @@ msgstr "Globale Ansage von %s:"
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Anderen Spieler ignorieren"
diff --git a/po/es.po b/po/es.po
index 2e1f15442..b09b35c8c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/es/)\n"
@@ -111,7 +111,7 @@ msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
@@ -437,7 +437,7 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Tienda"
 
@@ -706,7 +706,7 @@ msgstr "arco iris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -742,7 +742,7 @@ msgid "Ignore"
 msgstr "Ignorar"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Mapa"
 
@@ -1224,7 +1224,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1882,10 +1882,6 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar Ventanas"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Editar"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Presiona el botón para empezar la calibración"
@@ -1930,163 +1926,163 @@ msgstr "Por defecto"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflicto de teclas detectado."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Misceláneos"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstruos"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Mostrar daño infligido a monstruos"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Eligir automáticamente sólo a los monstruos alcanzables"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Resaltar el alcanze de ataque de los monstruos"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de energía del monstruo"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Apuntar a los monstruos en derredor, no necesariamente al más cercano"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Mostrar las partículas de efectos"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Resaltar las puertas del mapa"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Resaltar los objetos sobre el suelo"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Resaltar el alcance de ataque del jugador"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Mostrar minmapas extendidos"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Dibujar trayectoria"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Dibujar teclas de acceso rápido en el mapa"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "En movimiento"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Corrección automatica de la posición"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Atacar mientras está en movimiento"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Sincronización de movimiento de jugador"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Programa de movimientos locos A"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Jugador"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Mostrar barra de energía propia"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Habilitar estadísticas rápidas"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Apuntar a los jugadores en derredor, no necesariamente al más cercano"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Mostrar los mensajes de experiencia de trabajo"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Mostrar las ventanas emergentes de jugadores"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Mensaje afk"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Mostrar trabajo"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Habilitar el protocolo de anuncio"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Aceptar solicitudes de compra / venta"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Habilitar la tienda"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Registro de diálogo de NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Otro"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Habilitar los ataques colaterales de servidor"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Habilitar el control de robot"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Habilitar la proteción contra servidores defectuosos"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Habilitar registro de depuración"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Modo de bajo tráfico"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Ocultar los objetos escudos"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Mostrar fondo"
 
@@ -2226,67 +2222,71 @@ msgstr "Relaciones"
 msgid "When ignoring:"
 msgstr "Cuando se ignora a alguien:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Diminuto (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Pequeño (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Medio (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Extenso (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Tema de interfáz gráfica"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Fuente principal"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Fuente negrita"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Fuente de partícula"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Fuente de la ayuda"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Fuente segura"
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Tamaño de fuente"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie el juego para que los cambios tengan efecto."
@@ -3561,6 +3561,10 @@ msgstr "Anuncio global de  %s:"
 msgid "%s whispers: %s"
 msgstr "%s envía mensaje privado: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Editar"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora al jugador"
diff --git a/po/fi.po b/po/fi.po
index 5b5b5388e..216a31d94 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
 "PO-Revision-Date: 2011-08-09 22:45+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,7 +107,7 @@ msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
@@ -434,7 +434,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Kauppa"
 
@@ -703,7 +703,7 @@ msgstr "sateenkaari 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -739,7 +739,7 @@ msgid "Ignore"
 msgstr "Ohita"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Kartta"
 
@@ -1221,7 +1221,7 @@ msgid "Submit"
 msgstr "Lähetä"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
@@ -1879,10 +1879,6 @@ msgstr "Hyväksy"
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Muokkaa"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
@@ -1927,163 +1923,163 @@ msgstr "Oletus"
 msgid "Key Conflict(s) Detected."
 msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Sekal."
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Hirviöt"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Näytä hirviön saama vahinko"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Valikoi kohteiksi vain saavutettavia hirviöitä"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Korosta hirviön hyökkäyskantama"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Näytä hirviön vp-palkki"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Vaihda hirviökohteita syklissä"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Näytä siirtymissä hiukkastehoste"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Korosta karttasiirtymät"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Korosta maassa olevat tavarat"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Korosta pelaajan hyökkäyskantama"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Näytä parannellut minikartat"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Piirrä polku"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Piirrä siirtymäpikanäppäimet kartalle"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Korjaa sijainti automaattisesti"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Hyökkää liikkuessa"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Synkronoi pelaajan liikkeet"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Villiliike (a) -ohjelma"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Näytä oma vp-palkki"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Ota pikatilastot käyttöön"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Vaihda pelaajakohteita syklissä"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Näytä työkokemusviestit"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Näytä pelaajaponnahdusikkunat"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Näytä työ"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Ota käyttöön hyökkäyssuodin"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Salli osta/myy-pyynnöt"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Ota kauppatila käyttöön"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Ota käyttöön palvelinpuolen hyökkäys"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Ota bottitutka käyttöön"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Ota käyttöön suoja bugisten palvelinten varalta"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Ota käyttöön debug-loki"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Matalan liikenteen tila"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Piilota kilpihahmo"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Näytä tausta"
 
@@ -2223,67 +2219,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "Kun jätät huomiotta:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Pikkiriikkinen (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Pieni (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Keskikokoinen (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Kookas (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Suuri (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Jättimäinen (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Teema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Käyttöliittymän teema"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Pääkirjasin"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Lihavoitu kirjasin"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Hiukkaskirjasin"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Ohjekirjasin"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Kirjasimen koko"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Ulkoasua muutettu"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
@@ -3554,6 +3554,10 @@ msgstr "%s ilmoittaa kaikille:"
 msgid "%s whispers: %s"
 msgstr "%s kuiskaa: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Muokkaa"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Jätä pelaaja huomiotta"
diff --git a/po/fr.po b/po/fr.po
index dd19797ae..043fd5c0b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
 "PO-Revision-Date: 2011-08-15 13:02+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
@@ -110,7 +110,7 @@ msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
@@ -439,7 +439,7 @@ msgid "Max"
 msgstr "Max."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Boutique"
 
@@ -708,7 +708,7 @@ msgstr "arc en ciel 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -744,7 +744,7 @@ msgid "Ignore"
 msgstr "Ignorer"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Carte"
 
@@ -1226,7 +1226,7 @@ msgid "Submit"
 msgstr "Soumettre"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "PNJ"
 
@@ -1883,10 +1883,6 @@ msgstr "Appliquer"
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Éditer"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
@@ -1931,163 +1927,163 @@ msgstr "Par défaut"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflit(s) de touche détecté(s)"
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Divers"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstres"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Montrer les dégâts infligés aux monstres"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Ne viser en auto que les monstres à portée de tir "
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Afficher la portée d'attaque des monstres"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Afficher la barre de vie des monstres"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Entourer les monstres visés"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Montrer les effets de déplacement"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Afficher les portails de changement de carte"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Mettre en évidence les items sur le sol"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Afficher la portée d'attaque du joueur"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Montrer les mini cartes étendues"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Afficher le chemin"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Afficher les touches-raccourcis sur la carte"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "En mouvement"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Auto-correction de position"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Attaquer en bougeant"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Synchroniser les mouvements du joueur"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Programme A de mouvement de fou"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Joueur"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Afficher votre propre barre de vie"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Activer les statistiques instantanées"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Entourer les joueurs visés"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Afficher les expériences de compétences"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Afficher les pop-ups des joueurs"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Message d'absence"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Afficher les compétences"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Activer le mode attaque"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Lancer le protocole d'avertissements"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Accepter les requêtes d'achat et de vente"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Activer le mode boutique"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Enregistrer les conversations des PNJ"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Autre"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Activer l'attaque de la part du serveur"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Activer le testeur de robots"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Activer la protection contre les serveurs instables"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Activer l'enregistrement des informations"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Mode traffic faible"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Cacher le bouclier"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Montrer le fond"
 
@@ -2227,67 +2223,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "Quand ignoré :"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Minuscule (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Petite (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Moyenne (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Grande (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Grand (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Immense (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Thème"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Thème de l'interface"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Police principale"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Police grasse"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Taille des effets de particules"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Police de l'aide"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Police sécurisée"
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Taille de police"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Thème changé"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarrez le jeu pour que les changements soient appliqués."
@@ -3575,6 +3575,10 @@ msgstr "Annonce globale de %s :"
 msgid "%s whispers: %s"
 msgstr "Message de %s : %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Éditer"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignore l'autre joueur"
diff --git a/po/hr.po b/po/hr.po
index f208048c2..49002ec23 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,7 +107,7 @@ msgid "Farewell, come back any time..."
 msgstr ""
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -437,7 +437,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Trgovina"
 
@@ -706,7 +706,7 @@ msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -742,7 +742,7 @@ msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Karta"
 
@@ -1226,7 +1226,7 @@ msgid "Submit"
 msgstr "Dostavi"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1882,10 +1882,6 @@ msgstr "Primjeni"
 msgid "Reset Windows"
 msgstr "Ponovno pokreni prozore"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Pritisnite tipku za početak kalibracije"
@@ -1930,163 +1926,163 @@ msgstr "Zadano"
 msgid "Key Conflict(s) Detected."
 msgstr "Otkriven je Konflikt(i) Tipki."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Čudovišta"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr ""
 
@@ -2226,67 +2222,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "Kad ignorira:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Veličina fonta"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
@@ -3555,6 +3555,10 @@ msgstr "Javna obavijest od %s:"
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 101fc0090..4bbda2e71 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -106,7 +106,7 @@ msgid "Farewell, come back any time..."
 msgstr ""
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -432,7 +432,7 @@ msgid "Max"
 msgstr "Max."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Üzlet"
 
@@ -701,7 +701,7 @@ msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -737,7 +737,7 @@ msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Térkép"
 
@@ -1219,7 +1219,7 @@ msgid "Submit"
 msgstr "Küldés"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "Gépjátékos"
 
@@ -1875,10 +1875,6 @@ msgstr "Alkalmaz"
 msgid "Reset Windows"
 msgstr "Ablakok alaphelyzetbe"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Nyomd meg a gombot a kalibrálás megkezdéséhez"
@@ -1923,163 +1919,163 @@ msgstr "Alapértelmezett"
 msgid "Key Conflict(s) Detected."
 msgstr "Billentyű ütközés van."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Szörny neve"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr ""
 
@@ -2219,67 +2215,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "Ha ignorolva van:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Betűméret"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
@@ -3550,6 +3550,10 @@ msgstr "Globális bejelentés (%s) :"
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index ac13c61ac..17b54ef61 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
 "id/)\n"
@@ -109,7 +109,7 @@ msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
@@ -430,7 +430,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Toko"
 
@@ -699,7 +699,7 @@ msgstr "pelangi 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -735,7 +735,7 @@ msgid "Ignore"
 msgstr "Abaikan"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Peta"
 
@@ -1215,7 +1215,7 @@ msgid "Submit"
 msgstr "Masukan"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1871,10 +1871,6 @@ msgstr "Terapkan"
 msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Ganti"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Tekan tombol untuk memulai kalibrasi"
@@ -1919,163 +1915,163 @@ msgstr "Kembalikan"
 msgid "Key Conflict(s) Detected."
 msgstr "Pertentangan kunci(kunci) terdeteksi."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "macam-macam"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Tampilkan damage yang ditimbulkan monster"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Jadikan monster yang terjangkau sebagai target otomatis"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Sorot Jangkauan menyerang monster"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Tampilkan hp bar monster"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Siklus target monster"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Sorot portal peta"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Sorot item yang jatuh"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Sorot Jangkauan menyerang pemain"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "Bergerak"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Perbaiki posisi otomatis"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Menyerang ketika berjalan"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Program Crazy move A"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Pemain"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Tampilkan hp bar sendiri"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Siklus target pemain"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Tampilkan pesan exp job"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Tampilkan popup pemain"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Pesan saat meninggalkan keyboard"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Perlihatkan Job"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Perbolehkan Penyaring Serangan"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Terima permintaan jual/beli"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Perbolehkan mode Jual"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Riwayat dialog NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Lainnya"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Perbolehkan pengecekan bot"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Perlihatkan latar belakang"
 
@@ -2215,67 +2211,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "Ketika menolak:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Sangat kecil (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Kecil (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Sedang (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Besar (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Sangat besar (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Sangat besar sekali (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Tema Gui"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Jenis huruf utama"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Jenis huruf tebal"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Jenis huruf/Karakter yang diperbolehkan"
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Ukuran huruf"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Tema diganti"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
@@ -3543,6 +3543,10 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Ganti"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 7a95c076f..8d21f6633 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <Necromong@inbox.ru>, 2011.
 # Necromonger <Necromong@inbox.ru>, 2011.
 # sn0w75 <ibenrunnin@gmail.com>, 2011.
@@ -10,14 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
+"ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/actorspritemanager.cpp:1034
@@ -109,7 +110,7 @@ msgid "Farewell, come back any time..."
 msgstr "さよなら、いつでも戻ってね..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s は存在しないので作成することが不可能！終了中…"
@@ -139,9 +140,11 @@ msgstr "空のメッセージを送信することはできません！"
 #: src/commandhandler.cpp:415
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
-msgstr "%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分です。"
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分"
+"です。"
 
 #: src/commandhandler.cpp:435
 #, c-format
@@ -290,7 +293,9 @@ msgstr ""
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"。"
+msgstr ""
+"/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"。"
 
 #: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
@@ -427,7 +432,7 @@ msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "店"
 
@@ -696,7 +701,7 @@ msgstr "虹 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -732,7 +737,7 @@ msgid "Ignore"
 msgstr "無視"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "地図"
 
@@ -1212,7 +1217,7 @@ msgid "Submit"
 msgstr "決定"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1715,7 +1720,9 @@ msgstr "お知らせ"
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
-msgstr "新しい音楽をダウンロードする場合は、クライアントを再起動する必要がある可能性がある"
+msgstr ""
+"新しい音楽をダウンロードする場合は、クライアントを再起動する必要がある可能性"
+"がある"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
@@ -1868,10 +1875,6 @@ msgstr "適用"
 msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "エディット"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "ボタンを押すと較正が始まります。"
@@ -1916,163 +1919,163 @@ msgstr "標準に戻す"
 msgid "Key Conflict(s) Detected."
 msgstr "キーが重複しています。"
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "他"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "モンスター"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "モンスターに与えた損傷を表示する"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "モンスターHPバーを表示する"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "パスを描画"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "自分のHPバーを表示する"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "仕事を表示する"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "デバッグループを有効にする"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "背景を表示する"
 
@@ -2212,67 +2215,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "無視の際には："
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "小さい (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "小（11）"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "媒体（12）"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "大（13）"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "ビッグ（14）"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "巨大（15）"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "テーマ"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "GUIテーマ"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "メインフォント"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "太字フォント"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "粒子のフォント"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "ヘルプフォント"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "フォントサイズ"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "テーマは変えました"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更のため、アプリケーションを再起動してください。"
@@ -3231,9 +3238,10 @@ msgid "Change"
 msgstr "変更"
 
 #: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重複して追加することは出来ません！"
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重"
+"複して追加することは出来ません！"
 
 #: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
@@ -3505,11 +3513,15 @@ msgstr "このコマンドでは、入力したユーザーをチャンネルの
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
 #: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で囲んでください。"
+msgstr ""
+"入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で"
+"囲んでください。"
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
-msgstr "チャンネルのオペレーターはチャンネルからオペレーター以外のユーザーを追い出すことができます。"
+msgstr ""
+"チャンネルのオペレーターはチャンネルからオペレーター以外のユーザーを追い出す"
+"ことができます。"
 
 #: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
@@ -3541,6 +3553,10 @@ msgstr "%sからのアナウンス:"
 msgid "%s whispers: %s"
 msgstr "%s ささやく: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "エディット"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > 他のプレイヤーを無視する"
@@ -3559,7 +3575,8 @@ msgstr "コマンド: /close"
 
 #: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
-msgstr "このコマンドでは、現在開いているプライベートメッセージのタブを閉じます。"
+msgstr ""
+"このコマンドでは、現在開いているプライベートメッセージのタブを閉じます。"
 
 #: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
@@ -3574,8 +3591,7 @@ msgid "Command: /unignore <player>"
 msgstr "コマンド：　/unignore <プレイヤー>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -4513,7 +4529,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"＜ポリシ＞を有効するためには「１」、「yes」か「true」を設定ください。無効にするために、「0」、「no」か「false」を設定ください。"
+"＜ポリシ＞を有効するためには「１」、「yes」か「true」を設定ください。無効にす"
+"るために、「0」、「no」か「false」を設定ください。"
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4536,7 +4553,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<ポリシ>を有効するためには、「1」、「yes」か「true」を設定ください。無効にする場合、「0」、「no」か「false」を設定ください。"
+"<ポリシ>を有効するためには、「1」、「yes」か「true」を設定ください。無効にす"
+"る場合、「0」、「no」か「false」を設定ください。"
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -4731,7 +4749,9 @@ msgstr "ゲームを続けるためにはコインを入れてください。"
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
-msgstr "ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに向かっただけ。"
+msgstr ""
+"ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに"
+"向かっただけ。"
 
 #: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
@@ -4790,7 +4810,9 @@ msgstr "命を失い、天国に向かった。"
 
 #: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "もしあなたがそんなにも生気に満ちていなかったならば、死んで葬られていたんじゃないか？"
+msgstr ""
+"もしあなたがそんなにも生気に満ちていなかったならば、死んで葬られていたんじゃ"
+"ないか？"
 
 #: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
@@ -4825,8 +4847,7 @@ msgstr "メッセージ"
 
 #: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "持っているアイテムは体重より半分以上なので、体力が回復できない。"
 
 #: src/net/ea/playerhandler.cpp:347
@@ -5458,5 +5479,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "不明なアイテム"
-
-
diff --git a/po/manaplus.pot b/po/manaplus.pot
index fd3517a1d..08ef05f5c 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-08-15 15:56+0300\n"
+"POT-Creation-Date: 2011-08-16 19:07+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"
@@ -107,7 +107,7 @@ msgid "Farewell, come back any time..."
 msgstr ""
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -430,7 +430,7 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr ""
 
@@ -699,7 +699,7 @@ msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -735,7 +735,7 @@ msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr ""
 
@@ -1217,7 +1217,7 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr ""
 
@@ -1873,10 +1873,6 @@ msgstr ""
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
@@ -1921,163 +1917,163 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr ""
 
@@ -2217,67 +2213,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -3545,6 +3545,10 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index de3106afe..c4e2b5925 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
 "manaplus/team/nl_BE/)\n"
@@ -108,7 +108,7 @@ msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -434,7 +434,7 @@ msgid "Max"
 msgstr "Maximum"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Winkel"
 
@@ -703,7 +703,7 @@ msgstr "regenboog 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -739,7 +739,7 @@ msgid "Ignore"
 msgstr "Negeer"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Map"
 
@@ -1221,7 +1221,7 @@ msgid "Submit"
 msgstr "Indienen"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1879,10 +1879,6 @@ msgstr "Toepassen"
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Wijzig"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
@@ -1927,163 +1923,163 @@ msgstr "Standaard"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monsters"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Toon aangebrachte schade aan monsters"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Automatisch enkel bereikbare monsters viseren"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Markeer het aanvalsbereik van de monsters"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Toon hp statusbalk van monsters"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Markeer vloer voorwerpen"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Markeer het aanvalsbereik van de speler"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Aanvallen tijdens verplaatsen"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Toon hp statusbalk van jezelf"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Zet snelle statistieken aan"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Accepteer koop/verkoop aanvragen"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "shop modus aanzetten"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Zet debug log aan"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr ""
 
@@ -2223,67 +2219,71 @@ msgstr ""
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Thema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Standaard Lettertype"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Vet lettertype"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Help lettertype"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Lettergrootte"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Thema is gewijzigd"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
@@ -3561,6 +3561,10 @@ msgstr "Globale aankondiging van %s:"
 msgid "%s whispers: %s"
 msgstr "%s fluistert: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Wijzig"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Negeer de andere speler"
diff --git a/po/pt.po b/po/pt.po
index eb4b45e79..b989aaf4e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
 "pt/)\n"
@@ -109,7 +109,7 @@ msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
@@ -435,7 +435,7 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Loja"
 
@@ -704,7 +704,7 @@ msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -740,7 +740,7 @@ msgid "Ignore"
 msgstr "Ignora"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Mapa"
 
@@ -1222,7 +1222,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1879,10 +1879,6 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Editar"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
@@ -1927,163 +1923,163 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstros"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Destacar alcance de inimigos"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Destacar alcance de meu ataque"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Desenhar caminho"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Desenhar atalhos no mapa"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "Movendo"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Auto-ajustar posição"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Sincronizar movimento"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Mostrar menssagens de job exp"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Mensagem Ausente"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Mostrar job"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "A habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Habilitar protocolo de aviso"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Outro"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Habilitar proteção contra servidores com bugs"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
@@ -2223,67 +2219,71 @@ msgstr "Relações"
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Minúsculo (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Pequeno (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Médio (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Largo (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Fonte"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Fonte negrito"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Fonte Segura"
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
@@ -3557,6 +3557,10 @@ msgstr "Anúncio geral de %s:"
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Editar"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora o outro jogador"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d40dd0ee6..f8646cbc4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/pt_BR/)\n"
@@ -111,7 +111,7 @@ msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
@@ -437,7 +437,7 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Loja"
 
@@ -706,7 +706,7 @@ msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -742,7 +742,7 @@ msgid "Ignore"
 msgstr "Ignora"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Mapa"
 
@@ -1224,7 +1224,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1881,10 +1881,6 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Editar"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
@@ -1929,163 +1925,163 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstros"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Destacar alcance de inimigos"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Destacar alcance de meu ataque"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Desenhar caminho"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Desenhar atalhos no mapa"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "Movendo"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Auto-ajustar posição"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Sincronizar movimento"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Mensagem Ausente"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Mostrar job"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Habilitar o protocolo de aviso"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Outro"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Habilitar proteção contra servidores com bugs"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
@@ -2225,67 +2221,71 @@ msgstr "Relações"
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Minúsculo (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Pequeno (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Médio (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Largo (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Fonte"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Fonte negrito"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Fonte segura"
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
@@ -3559,6 +3559,10 @@ msgstr "Anúncio geral de %s:"
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Editar"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora o outro jogador"
diff --git a/po/ru.po b/po/ru.po
index 59eb7179d..9b9772b33 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:03+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:10+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
 "ru/)\n"
@@ -111,7 +111,7 @@ msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
@@ -443,7 +443,7 @@ msgid "Max"
 msgstr "Макс"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "Магазин"
 
@@ -712,7 +712,7 @@ msgstr "радуга 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -748,7 +748,7 @@ msgid "Ignore"
 msgstr "Игнорировать"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Карта"
 
@@ -1232,7 +1232,7 @@ msgid "Submit"
 msgstr "Применить"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1889,10 +1889,6 @@ msgstr "Применить"
 msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "Изменить"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
@@ -1937,163 +1933,163 @@ msgstr "По умолчанию"
 msgid "Key Conflict(s) Detected."
 msgstr "Обнаружен(ы) конфликт(ы) клавиш!"
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "Разное"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Монстры"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "Показ. повр., нанесенные монстрам"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "Автоприцел по доступным монстрам"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "Подсветка радиуса атаки монстров"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "Показывать жизнь мобов"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr "Прокручивать прицел по монстрам"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr "Показывать анимацию порталов"
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "Подсветка точек перехода на карте"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "Подсветка предметов на полу"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "Подсветка радиуса атаки игрока"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr "Показывать расширенные миникарты"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "Рисовать путь"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr "Рисовать клавиши на карте"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "Движения"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "Авто. исправ. позиции"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "Атаковать в движении"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "Синх. движение"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "Программа для сумасшедших движений A"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "Игрок"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "Показывать свою жизнь"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "Включить быструю смену статов"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr "Прокручивать прицел по игрокам"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "Показывать опыт работы."
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "Показ. всплыв. сообщения игроков"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr "Ответ в режиме \"отошел\""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "Показывать уровень работы"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "Включить фильтр атак"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr "Включить режим посылки состояния"
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "Принимать запросы купить/продать"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "Включить режим магазина"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "Сохранять текст NPC"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "Другое"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "Включить серверную атаку"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "Включить детектор ботов"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "Включить защиту от сбойных серверов"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "Включить отлад. лог"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "Режим кеширования игроков"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr "Спрятать картинку счита"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "Показать фон"
 
@@ -2238,67 +2234,71 @@ msgstr "Связи"
 msgid "When ignoring:"
 msgstr "Когда игнорируется:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "Маленький (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "Маленький (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "Средний (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "Большой (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "Боьшой (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "Огромный (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "Тема"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "Тема интерфейса"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "Основной шрифт"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "Жирный шрифт"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "Шрифт частиц"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "Шрифт помощи"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr "Безопасный шрифт"
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr "Японский шрифт"
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "Тема изменена"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Перезегрузите игру дабы изменения вступили в силу."
@@ -3575,6 +3575,10 @@ msgstr "Глобальное объявление от %s:"
 msgid "%s whispers: %s"
 msgstr "%s шепчет: %s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Изменить"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Игнорировать другого игрока"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e2b281bb8..1d6c18fdc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <colorfullife81@gmail.com>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-15 15:56+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/team/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
+"team/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/actorspritemanager.cpp:1034
@@ -107,7 +108,7 @@ msgid "Farewell, come back any time..."
 msgstr "永别了，任何时候回来... ..."
 
 #: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918 src/client.cpp:1925
+#: src/client.cpp:1922 src/client.cpp:1929
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -137,8 +138,8 @@ msgstr "无法发送空白密语！"
 #: src/commandhandler.cpp:415
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
 
 #: src/commandhandler.cpp:435
@@ -425,7 +426,7 @@ msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
 msgid "Shop"
 msgstr "商店"
 
@@ -694,7 +695,7 @@ msgstr "彩虹3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
 #: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
 #: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -730,7 +731,7 @@ msgid "Ignore"
 msgstr "忽略"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "地图"
 
@@ -1210,7 +1211,7 @@ msgid "Submit"
 msgstr "提交"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
 msgid "NPC"
 msgstr "NPC"
 
@@ -1866,10 +1867,6 @@ msgstr "应用"
 msgid "Reset Windows"
 msgstr "重置窗口"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr "编辑"
-
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
@@ -1914,163 +1911,163 @@ msgstr "预设"
 msgid "Key Conflict(s) Detected."
 msgstr "检测到按键冲突。"
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
 msgstr "杂项"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "怪物"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
 msgstr "显示损坏造成的，以怪物"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
 msgstr "自动目标只有到达怪物"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
 msgstr "突出显示怪物的攻击范围"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
 msgstr "显示怪物HP栏"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
 msgstr "突出显示的地图门户网站"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
 msgstr "突出地板项目"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
 msgstr "突出显示球员的攻击范围"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
 msgstr "绘制路径"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
 msgid "Moving"
 msgstr "移动"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
 msgstr "自动修复的位置"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
 msgid "Attack while moving"
 msgstr "攻击的同时移动"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Sync player move"
 msgstr "同步播放移动"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
 msgid "Crazy move A program"
 msgstr "疯狂的举动的程序"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
 msgid "Player"
 msgstr "玩家"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
 msgstr "显示自己的HP栏"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
 msgid "Enable quick stats"
 msgstr "启用快速统计"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
 msgid "Show job exp messages"
 msgstr "显示工作EXP消息"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
 msgid "Show players popups"
 msgstr "显示球员弹出窗口"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
 msgid "Show job"
 msgstr "显示工作"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
 msgid "Enable attack filter"
 msgstr "启用攻击过滤器"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
 msgid "Accept sell/buy requests"
 msgstr "接受出售/购买请求"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
 msgid "Enable shop mode"
 msgstr "启用店模式"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
 msgid "Log NPC dialogue"
 msgstr "NPC对话"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:148
 msgid "Other"
 msgstr "其他"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:153
 msgid "Enable bot checker"
 msgstr "启用BOT检查"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Enable buggy servers protection"
 msgstr "启用BUG保护"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:159
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:162
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:165
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:168
 msgid "Show background"
 msgstr "显示背景"
 
@@ -2210,67 +2207,71 @@ msgstr "关系"
 msgid "When ignoring:"
 msgstr "当忽略时："
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
 msgstr "小（10）"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
 msgstr "小 (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
 msgstr "中 (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
 msgstr "大 (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
 msgstr "大(14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
 msgstr "巨大的 (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
 msgstr "主题"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
 msgstr "桂主题"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
 msgstr "主要字体"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
 msgstr "加粗字体"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
 msgstr "粒子字体"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
 msgstr "帮助字体"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "字体大小"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
 msgstr "主题更改"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效。"
@@ -3229,8 +3230,7 @@ msgid "Change"
 msgstr "改变"
 
 #: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
 #: src/gui/tradewindow.cpp:377
@@ -3539,6 +3539,10 @@ msgstr "%s 全局公告："
 msgid "%s whispers: %s"
 msgstr "%s私语:%s"
 
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "编辑"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > "
@@ -3572,8 +3576,7 @@ msgid "Command: /unignore <player>"
 msgstr "命令: /uninore <>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "此命令将停止忽视了其他的球员，如果他们被忽略了。"
 
 #: src/gui/windowmenu.cpp:65
@@ -4510,7 +4513,9 @@ msgstr "改命令改变帮会的物品共享策略。"
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
-msgstr "<策略>可以为“1”，“yes”，“true”其中一以开启物品共享，或者 是\"0\",\"no\",\"false\"用来禁止物品共享。"
+msgstr ""
+"<策略>可以为“1”，“yes”，“true”其中一以开启物品共享，或者 是\"0\",\"no\","
+"\"false\"用来禁止物品共享。"
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4532,7 +4537,9 @@ msgstr "该命令改变帮会的经验共享策略。"
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr "<策略>可以为“1”，“yes”，“true”其中之一以开启经验共享，或者 是\"0\",\"no\",\"false\"用来关闭经验共享。"
+msgstr ""
+"<策略>可以为“1”，“yes”，“true”其中之一以开启经验共享，或者 是\"0\",\"no\","
+"\"false\"用来关闭经验共享。"
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -4812,7 +4819,9 @@ msgstr ""
 
 #: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
-msgstr "<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\",\"false\"用来禁止物品共享。"
+msgstr ""
+"<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\","
+"\"false\"用来禁止物品共享。"
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
 #: src/net/ea/playerhandler.cpp:425
@@ -4821,8 +4830,7 @@ msgstr "讯息"
 
 #: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）"
 
 #: src/net/ea/playerhandler.cpp:347
@@ -5454,5 +5462,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "未知物品"
-
-
-- 
cgit v1.2.3-70-g09d2


From 0d99a4950df52de9e72c9adc3c7661a286349acb Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 20 Aug 2011 17:50:13 +0300
Subject: Update translations.

---
 po/de.po        |  72 +++----
 po/es.po        | 100 +++++-----
 po/fi.po        |  77 ++++----
 po/fr.po        |  74 +++----
 po/hr.po        |  72 +++----
 po/hu.po        |  72 +++----
 po/id.po        |  72 +++----
 po/ja.po        |  72 +++----
 po/manaplus.pot |  70 +++----
 po/nl_BE.po     | 590 ++++++++++++++++++++++++++++----------------------------
 po/pt.po        |  82 ++++----
 po/pt_BR.po     |  82 ++++----
 po/ru.po        |  72 +++----
 po/zh_CN.po     |  72 +++----
 14 files changed, 791 insertions(+), 788 deletions(-)

(limited to 'po/ja.po')

diff --git a/po/de.po b/po/de.po
index 310a34f6e..7eb2d412b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
@@ -301,43 +301,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Allgemein"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:487
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:495
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:535
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:1203
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:1210
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:1596
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1597
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
@@ -903,11 +903,11 @@ msgstr ""
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
 #: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
 #: src/gui/popupmenu.cpp:1783
@@ -919,7 +919,7 @@ msgid "Help"
 msgstr "Hilfe"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventar"
 
@@ -3247,16 +3247,16 @@ msgstr "Du gibst:"
 msgid "Change"
 msgstr "Ändern"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "Du hast nicht genügend Geld."
+
+#: src/gui/tradewindow.cpp:453
 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:377
-msgid "You don't have enough money."
-msgstr "Du hast nicht genügend Geld."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
@@ -3695,11 +3695,11 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
@@ -4092,68 +4092,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index b09b35c8c..e367da940 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-16 19:07+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-17 18:06+0000\n"
+"Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/es/)\n"
 "Language: es\n"
@@ -62,7 +62,7 @@ msgstr "Entrando al mundo del juego"
 
 #: src/client.cpp:1073
 msgid "Requesting characters"
-msgstr "Cargando jugadores"
+msgstr "Cargando personajes"
 
 #: src/client.cpp:1104
 msgid "Connecting to the game server"
@@ -302,43 +302,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:487
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:495
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:535
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con elservidor."
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:1203
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
-#: src/game.cpp:1210
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/game.cpp:1596
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1597
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -904,11 +904,11 @@ msgstr "Abrir automáticamente esta ventana"
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipamiento"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
 #: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
 #: src/gui/popupmenu.cpp:1783
@@ -920,7 +920,7 @@ msgid "Help"
 msgstr "Ayuda"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -1431,7 +1431,7 @@ msgstr "Quitar"
 
 #: src/gui/popupmenu.cpp:508
 msgid "Warp"
-msgstr ""
+msgstr "Deformar"
 
 #: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
@@ -2100,7 +2100,7 @@ msgstr "Ajustar rendimiento automáticamente"
 
 #: src/gui/setup_perfomance.cpp:61
 msgid "Show beings transparency"
-msgstr ""
+msgstr "Mostrar transparencia de criaturas"
 
 #: src/gui/setup_perfomance.cpp:64
 msgid "Hw acceleration"
@@ -2112,7 +2112,7 @@ msgstr "Habilitar caché de opacidad (Software, puede usar mucha memoria)"
 
 #: src/gui/setup_perfomance.cpp:70
 msgid "Enable map reduce (Software)"
-msgstr ""
+msgstr "Habilitar reducción de mapa (Software)"
 
 #: src/gui/setup_perfomance.cpp:73
 msgid "Better quality (disable for better perfomance)"
@@ -2124,7 +2124,7 @@ msgstr "Habilitar corrección de canal alfa (Software, puede ser muy lento)"
 
 #: src/gui/setup_perfomance.cpp:80
 msgid "Enable reorder sprites."
-msgstr ""
+msgstr "Habilitar re ordenamiento de sprites."
 
 #: src/gui/setup_perfomance.cpp:83
 msgid "Small memory (enable for lower memory usage)"
@@ -2132,11 +2132,11 @@ msgstr "Poca memoria (permite un uso más bajo de memoria)"
 
 #: src/gui/setup_perfomance.cpp:86
 msgid "Disable advanced beings caching (Software)"
-msgstr ""
+msgstr "Deshabilitar caché avanzado de criaturas (Software)"
 
 #: src/gui/setup_perfomance.cpp:89
 msgid "Disable beings caching (Software)"
-msgstr ""
+msgstr "Deshabilitar caché de criaturas (Software)"
 
 #: src/gui/setup_players.cpp:48
 msgid "Players"
@@ -2176,7 +2176,7 @@ msgstr "Mostrar estados"
 
 #: src/gui/setup_players.cpp:78
 msgid "Show ip addresses on screenshots"
-msgstr ""
+msgstr "Mostrar dirección IP en la captura de pantalla"
 
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
@@ -2276,7 +2276,7 @@ msgstr "Fuente segura"
 
 #: src/gui/setup_theme.cpp:151
 msgid "Japanese font"
-msgstr ""
+msgstr "Fuente japonesa"
 
 #: src/gui/setup_theme.cpp:183
 msgid "Font size"
@@ -3247,16 +3247,16 @@ msgstr "Tú das:"
 msgid "Change"
 msgstr "Cambiar"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "No tienes dinero suficiente."
+
+#: src/gui/tradewindow.cpp:453
 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:377
-msgid "You don't have enough money."
-msgstr "No tienes dinero suficiente."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
@@ -3294,7 +3294,7 @@ msgstr "Completado"
 
 #: src/gui/userpalette.cpp:116
 msgid "Being"
-msgstr "Personaje"
+msgstr "Ser"
 
 #: src/gui/userpalette.cpp:117
 msgid "Friend Names"
@@ -3523,7 +3523,7 @@ msgstr "Hacer al jugador <nick> operador del canal."
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
 #: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Si el <nick> posee espacios, enciérrelo entre comillas dobles (\")."
+msgstr "Si el <nick> tiene espacios, enciérralo entre comillas dobles (\")."
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
@@ -3601,7 +3601,7 @@ msgstr "Comando: /unignore <jugador>"
 
 #: src/gui/widgets/whispertab.cpp:131
 msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Este comando para de ignorar al jugador si había sido ignorado."
+msgstr "Este comando para de ignorar al jugador si está siendo ignorado."
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
@@ -3695,11 +3695,11 @@ msgstr "Cambiar de Login"
 msgid "Choose World"
 msgstr "Escojer Mundo"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr "Mochila"
 
@@ -4094,68 +4094,68 @@ msgstr ""
 "Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
 "puede presentar un comportamiento raro."
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr "Fuiste eliminado por "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistante."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
 msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "Imitacion: "
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr "Imitar cancelado"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "Ves "
 
diff --git a/po/fi.po b/po/fi.po
index 216a31d94..fd66fa93a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-16 19:07+0300\n"
-"PO-Revision-Date: 2011-08-09 22:45+0000\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fi\n"
@@ -299,43 +299,43 @@ msgstr ""
 "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
 "\"true\", \"false\", \"1\" tai \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Yleiset"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:487
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/game.cpp:495
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:535
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:1203
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
-#: src/game.cpp:1210
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/game.cpp:1596
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:1597
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -901,11 +901,11 @@ msgstr ""
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
 #: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
 #: src/gui/popupmenu.cpp:1783
@@ -917,7 +917,7 @@ msgid "Help"
 msgstr "Apua"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Tavarat"
 
@@ -3242,14 +3242,14 @@ msgstr "Annat:"
 msgid "Change"
 msgstr "Muuta"
 
-#: 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:377
+#: src/gui/tradewindow.cpp:374
 msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
+#: src/gui/tradewindow.cpp:453
+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/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
@@ -3689,11 +3689,11 @@ msgstr "Vaihda kirjautumistietoja"
 msgid "Choose World"
 msgstr "Valitse pelimaailma"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "Varasto"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr "Kärry"
 
@@ -4088,68 +4088,68 @@ msgstr ""
 "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
 "ole hyvä ja poista päällekkäisyydet. "
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr "Sinut otti hengiltä "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit nostaa olemattoman tavaran."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr "Tuntematon ongelma esti tavaran nostamisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "Seuraa: "
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "Matki: "
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "Näet "
 
@@ -5495,6 +5495,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
-
-#~ msgid "Save state"
-#~ msgstr "Tallenna tila"
diff --git a/po/fr.po b/po/fr.po
index 043fd5c0b..4727011b8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-16 19:07+0300\n"
-"PO-Revision-Date: 2011-08-15 13:02+0000\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
 "fr/)\n"
@@ -303,44 +303,44 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Général"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Informations"
 
-#: src/game.cpp:487
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée sous"
 
-#: src/game.cpp:495
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "La sauvegarde de la capture d'écran a échoué !"
 
-#: src/game.cpp:535
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr ""
 "La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:1203
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1210
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1596
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargée"
 
-#: src/game.cpp:1597
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
@@ -906,11 +906,11 @@ msgstr "Ouverture automatique de cette fenêtre"
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Équipement"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
 #: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
 #: src/gui/popupmenu.cpp:1783
@@ -922,7 +922,7 @@ msgid "Help"
 msgstr "Aide"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventaire"
 
@@ -3257,16 +3257,16 @@ msgstr "Vous donnez :"
 msgid "Change"
 msgstr "Changer"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "Vous n'avez pas assez d'argent."
+
+#: src/gui/tradewindow.cpp:453
 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:377
-msgid "You don't have enough money."
-msgstr "Vous n'avez pas assez d'argent."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
@@ -3709,11 +3709,11 @@ msgstr "Changer de Compte"
 msgid "Choose World"
 msgstr "Choix du monde"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "Entrepôt"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr "Sac"
 
@@ -4108,68 +4108,68 @@ msgstr ""
 "Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des "
 "touches ou attendez vous à un possible comportement étrange du jeu."
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr "Vous avez été tué par "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
 msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "Vous voyez  "
 
diff --git a/po/hr.po b/po/hr.po
index 49002ec23..e52a56bdc 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -302,43 +302,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Općenito"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:495
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
-#: src/game.cpp:535
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Mreža Greška"
 
-#: src/game.cpp:1203
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1210
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1596
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1597
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Greška prilikom učitavanja %s"
@@ -904,11 +904,11 @@ msgstr ""
 msgid "OK"
 msgstr "U redu"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Oprema"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
 #: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
 #: src/gui/popupmenu.cpp:1783
@@ -920,7 +920,7 @@ msgid "Help"
 msgstr "Pomoć"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Zalihe"
 
@@ -3244,14 +3244,14 @@ msgstr "Daješ:"
 msgid "Change"
 msgstr "Izmijeni"
 
-#: 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:377
+#: src/gui/tradewindow.cpp:374
 msgid "You don't have enough money."
 msgstr "Nemate dovoljno novca."
 
+#: src/gui/tradewindow.cpp:453
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
@@ -3687,11 +3687,11 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
@@ -4084,41 +4084,41 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4126,27 +4126,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 4bbda2e71..489ebc42c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -297,43 +297,43 @@ msgstr ""
 "Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", "
 "\"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Általános"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:495
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
-#: src/game.cpp:535
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
-#: src/game.cpp:1203
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Kereskedési kérelmek elutasítása"
 
-#: src/game.cpp:1210
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
-#: src/game.cpp:1596
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1597
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Hiba %s betöltése közben"
@@ -899,11 +899,11 @@ msgstr ""
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Felszerelés"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
 #: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
 #: src/gui/popupmenu.cpp:1783
@@ -915,7 +915,7 @@ msgid "Help"
 msgstr "Súgó"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Táska"
 
@@ -3237,15 +3237,15 @@ msgstr "Adott tárgyak:"
 msgid "Change"
 msgstr "Változtatás"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "Nincs elég pénzed."
+
+#: src/gui/tradewindow.cpp:453
 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:377
-msgid "You don't have enough money."
-msgstr "Nincs elég pénzed."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
@@ -3682,11 +3682,11 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
@@ -4079,68 +4079,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index 17b54ef61..24a18204f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
 "PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
@@ -295,43 +295,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Umum"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:487
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Screenshot disimpan sebagai"
 
-#: src/game.cpp:495
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
-#: src/game.cpp:535
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus"
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
-#: src/game.cpp:1203
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Abaikan permohonan transaksi"
 
-#: src/game.cpp:1210
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/game.cpp:1596
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:1597
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error ketika menunggu %s"
@@ -897,11 +897,11 @@ msgstr "Buka jendela otomatis"
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Perlengkapan"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
 #: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
 #: src/gui/popupmenu.cpp:1783
@@ -913,7 +913,7 @@ msgid "Help"
 msgstr "Bantuan"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Perbekalan"
 
@@ -3233,14 +3233,14 @@ msgstr "Anda memberikan:"
 msgid "Change"
 msgstr "Ubah"
 
-#: 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:377
+#: src/gui/tradewindow.cpp:374
 msgid "You don't have enough money."
 msgstr "Anda tidak memiliki cukup uang."
 
+#: src/gui/tradewindow.cpp:453
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
@@ -3675,11 +3675,11 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "Tempat penyimpanan"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
@@ -4072,67 +4072,67 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada"
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "item terlalu berat"
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "barang terlalu jauh"
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh"
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "Ikuti:"
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "Tirukan:"
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 8d21f6633..4832693a3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
 "PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
@@ -297,43 +297,43 @@ msgstr ""
 "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", "
 "\"0\"。"
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "デバッグ"
 
-#: src/game.cpp:487
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:495
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存することに失敗しました！"
 
-#: src/game.cpp:535
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:1203
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "他人からのトレードリクエストを無視します。"
 
-#: src/game.cpp:1210
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "他人からのトレードリクエストを受け入れます。"
 
-#: src/game.cpp:1596
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "マップをロードできませんでした"
 
-#: src/game.cpp:1597
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sをロードしている間にエラーが起きました。"
@@ -899,11 +899,11 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "装備"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
 #: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
 #: src/gui/popupmenu.cpp:1783
@@ -915,7 +915,7 @@ msgid "Help"
 msgstr "ヘルプ"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "アイテム"
 
@@ -3237,16 +3237,16 @@ msgstr "あげる物:"
 msgid "Change"
 msgstr "変更"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "現金不足です。"
+
+#: src/gui/tradewindow.cpp:453
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重"
 "複して追加することは出来ません！"
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr "現金不足です。"
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
@@ -3686,11 +3686,11 @@ msgstr "ログインの変更"
 msgid "Choose World"
 msgstr "世界を選ぶ"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "保存"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr "荷馬車"
 
@@ -4083,67 +4083,67 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "去って"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "従う: "
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "擬い: "
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "あなた"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 08ef05f5c..a4346b7d8 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-08-16 19:07+0300\n"
+"POT-Creation-Date: 2011-08-20 17:42+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"
@@ -295,43 +295,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:495
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:535
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1203
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1210
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1596
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1597
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -897,11 +897,11 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
 #: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
 #: src/gui/popupmenu.cpp:1783
@@ -913,7 +913,7 @@ msgid "Help"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr ""
 
@@ -3235,12 +3235,12 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:332
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
+#: src/gui/tradewindow.cpp:453
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3677,11 +3677,11 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
@@ -4074,68 +4074,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index c4e2b5925..15fa66fb7 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-16 19:07+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-17 21:39+0000\n"
+"Last-Translator: AL13N <maarten.vanraes@gmail.com>\n"
 "Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
 "manaplus/team/nl_BE/)\n"
 "Language: nl_BE\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
-msgstr ""
+msgstr "Zichtbaar op de map"
 
 #: src/being.cpp:542
 msgid "dodge"
@@ -34,12 +34,12 @@ msgstr "mist"
 #. TRANSLATORS: this away status writed in player nick
 #: src/being.cpp:1514
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
 #: src/being.cpp:1519
 msgid "I"
-msgstr ""
+msgstr "I"
 
 #: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
@@ -232,42 +232,42 @@ msgstr "Speler kan niet worden verwijderd!"
 #: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
 #, c-format
 msgid "Client uptime: %s"
-msgstr ""
+msgstr "Client uptime: %s"
 
 #: src/commandhandler.cpp:982
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d week"
+msgstr[1] "%d weken"
 
 #: src/commandhandler.cpp:991
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d dag"
+msgstr[1] "%d dagen"
 
 #: src/commandhandler.cpp:999
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d uur"
+msgstr[1] "%d uren"
 
 #: src/commandhandler.cpp:1007
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d minuut"
+msgstr[1] "%d minuten"
 
 #: src/commandhandler.cpp:1015
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d seconde"
+msgstr[1] "%d seconden"
 
 #: src/commandhandler.cpp:1094
 msgid "font cache size"
@@ -279,11 +279,11 @@ msgstr ""
 
 #: src/commandhandler.cpp:1110
 msgid "Created:"
-msgstr ""
+msgstr "Aangemaakt:"
 
 #: src/commandhandler.cpp:1112
 msgid "Deleted:"
-msgstr ""
+msgstr "Verwijdered:"
 
 #: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
 msgid "Resource images:"
@@ -299,43 +299,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:487
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Scherafdruk opgeslagen als:"
 
-#: src/game.cpp:495
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:535
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1203
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1210
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1596
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:1597
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -556,7 +556,7 @@ msgstr "Haarstijl:"
 
 #: src/gui/charcreatedialog.cpp:89
 msgid "Race:"
-msgstr ""
+msgstr "Ras:"
 
 #: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
 #: src/gui/socialwindow.cpp:1033
@@ -616,15 +616,15 @@ msgstr "Wijzig Email"
 
 #: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
-msgstr ""
+msgstr "Ongeldig paswoord"
 
 #: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
-msgstr ""
+msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 
 #: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
-msgstr ""
+msgstr "Geef wachtwoord:"
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
@@ -749,7 +749,7 @@ msgstr "Doel"
 
 #: src/gui/debugwindow.cpp:72
 msgid "Net"
-msgstr ""
+msgstr "Net"
 
 #: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
 #: src/gui/debugwindow.cpp:249
@@ -842,7 +842,7 @@ msgstr "Doel Gilde:"
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
 #: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
 msgid "Attack delay:"
-msgstr ""
+msgstr "Aanvalsvertraging:"
 
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
 #: src/gui/debugwindow.cpp:349
@@ -876,7 +876,7 @@ msgstr "Uitvoer: %d bytes/sec"
 
 #: src/gui/didyouknowwindow.cpp:47
 msgid "Did You Know?"
-msgstr ""
+msgstr "Weet u?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
@@ -886,11 +886,11 @@ msgstr "Sluiten"
 
 #: src/gui/didyouknowwindow.cpp:62
 msgid "< Previous"
-msgstr ""
+msgstr "< Vorig"
 
 #: src/gui/didyouknowwindow.cpp:63
 msgid "Next >"
-msgstr ""
+msgstr "Volgend >"
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "Auto open this window"
@@ -901,11 +901,11 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
 #: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
 #: src/gui/popupmenu.cpp:1783
@@ -917,7 +917,7 @@ msgid "Help"
 msgstr "Help"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventaris"
 
@@ -1116,7 +1116,7 @@ msgstr ""
 #: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
-msgstr ""
+msgstr "  Tijd tot volgend niveau: %s"
 
 #: src/gui/killstats.cpp:361
 #, c-format
@@ -1231,7 +1231,7 @@ msgstr "Wissen"
 
 #: src/gui/npcdialog.cpp:222
 msgid "> Next"
-msgstr ""
+msgstr "> Volgende"
 
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
@@ -1279,7 +1279,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
 #: src/gui/popupmenu.cpp:628
 msgid "Be friend"
-msgstr ""
+msgstr "Word vriend"
 
 #: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
 #: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
@@ -1296,7 +1296,7 @@ msgstr "Geen rekening mee houden"
 #: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
 #: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
 msgid "Erase"
-msgstr ""
+msgstr "Wis"
 
 #: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
@@ -1311,17 +1311,17 @@ msgstr ""
 #: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
-msgstr ""
+msgstr "Volledig genegeerd"
 
 #: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
 #: src/gui/popupmenu.cpp:672
 msgid "Follow"
-msgstr ""
+msgstr "Volg"
 
 #: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
 #: src/gui/popupmenu.cpp:673
 msgid "Imitation"
-msgstr ""
+msgstr "Imiteer"
 
 #: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
 msgid "Invite to party"
@@ -1349,7 +1349,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:242
 msgid "Kick player"
-msgstr ""
+msgstr "Schop speler"
 
 #: src/gui/popupmenu.cpp:244
 msgid "Nuke"
@@ -1362,7 +1362,7 @@ msgstr "Toon Voorwerpen"
 #: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
 #: src/gui/popupmenu.cpp:1970
 msgid "Undress"
-msgstr ""
+msgstr "ontkleed"
 
 #: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
 #: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
@@ -1373,16 +1373,16 @@ msgstr ""
 #: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
 #: src/gui/popupmenu.cpp:695
 msgid "Buy (?)"
-msgstr ""
+msgstr "Koop (?)"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:697
 msgid "Sell (?)"
-msgstr ""
+msgstr "Verkoop (?)"
 
 #: src/gui/popupmenu.cpp:298
 msgid "Kick"
-msgstr ""
+msgstr "Schop"
 
 #: src/gui/popupmenu.cpp:309
 msgid "Remove from attack list"
@@ -1406,7 +1406,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:483
 msgid "Pick up"
-msgstr ""
+msgstr "Raap op"
 
 #: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
 #: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
@@ -1419,12 +1419,12 @@ msgstr "Plaats voorwerp op de kaart"
 
 #: src/gui/popupmenu.cpp:502
 msgid "Rename"
-msgstr ""
+msgstr "Hernoem"
 
 #: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
 #: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
 msgid "Remove"
-msgstr ""
+msgstr "Verwijder"
 
 #: src/gui/popupmenu.cpp:508
 msgid "Warp"
@@ -1432,7 +1432,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
-msgstr ""
+msgstr "Inladen oude kleren"
 
 #: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1456,19 +1456,19 @@ msgstr "Markering aanzetten"
 
 #: src/gui/popupmenu.cpp:577
 msgid "Dont remove name"
-msgstr ""
+msgstr "De naam niet verwijderen"
 
 #: src/gui/popupmenu.cpp:582
 msgid "Remove name"
-msgstr ""
+msgstr "Verwijder naam"
 
 #: src/gui/popupmenu.cpp:587
 msgid "Enable away"
-msgstr ""
+msgstr "away aanzetten"
 
 #: src/gui/popupmenu.cpp:592
 msgid "Disable away"
-msgstr ""
+msgstr "away afzetten"
 
 #: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
 msgid "Leave"
@@ -1529,7 +1529,7 @@ msgstr "Plaats alles"
 #: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
 #: src/gui/popupmenu.cpp:1793
 msgid "Drop all"
-msgstr ""
+msgstr "Laat alles vallen"
 
 #: src/gui/popupmenu.cpp:1674
 msgid "Retrieve 10"
@@ -1553,11 +1553,11 @@ msgstr "Laden van oude neerleggingsnelkoppeling"
 
 #: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
 msgid "Hide"
-msgstr ""
+msgstr "Verberg"
 
 #: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
 msgid "Show"
-msgstr ""
+msgstr "Toon"
 
 #: src/gui/popupmenu.cpp:1883
 msgid "Reset yellow bar"
@@ -1565,20 +1565,20 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
 msgid "Copy to chat"
-msgstr ""
+msgstr "Kopieer naar chat"
 
 #: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
-msgstr ""
+msgstr "(standaard)"
 
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
 msgid "Move up"
-msgstr ""
+msgstr "Beweeg naar boven"
 
 #: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
 msgid "Move down"
-msgstr ""
+msgstr "Beweeg naar beneden"
 
 #: src/gui/quitdialog.cpp:56
 msgid "Switch server"
@@ -1626,7 +1626,7 @@ msgstr "Kies Uw Server"
 
 #: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr ""
+msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
 
 #: src/gui/serverdialog.cpp:247
 msgid "Port:"
@@ -1746,7 +1746,7 @@ msgstr "Toon chat kleurenlijst"
 
 #: src/gui/setup_chat.cpp:64
 msgid "Commands"
-msgstr ""
+msgstr "Commando's"
 
 #: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
@@ -1754,7 +1754,7 @@ msgstr ""
 
 #: src/gui/setup_chat.cpp:70
 msgid "Limits"
-msgstr ""
+msgstr "Limieten"
 
 #: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
@@ -1766,7 +1766,7 @@ msgstr "Limiteer max lijnen in chat"
 
 #: src/gui/setup_chat.cpp:79
 msgid "Logs"
-msgstr ""
+msgstr "Logs"
 
 #: src/gui/setup_chat.cpp:81
 msgid "Enable chat Log"
@@ -1778,7 +1778,7 @@ msgstr "Toon chat geschiedenis"
 
 #: src/gui/setup_chat.cpp:88
 msgid "Messages"
-msgstr ""
+msgstr "Berichten"
 
 #: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
@@ -1818,11 +1818,11 @@ msgstr ""
 
 #: src/gui/setup_chat.cpp:118
 msgid "Time"
-msgstr ""
+msgstr "Tijd"
 
 #: src/gui/setup_chat.cpp:120
 msgid "Use local time"
-msgstr ""
+msgstr "Gebruik lokale tijd"
 
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
@@ -1969,7 +1969,7 @@ msgstr "Markeer het aanvalsbereik van de speler"
 
 #: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
-msgstr ""
+msgstr "Toon uitgebreide minimaps"
 
 #: src/gui/setup_other.cpp:81
 msgid "Draw path"
@@ -1981,7 +1981,7 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:88
 msgid "Moving"
-msgstr ""
+msgstr "Bewegen"
 
 #: src/gui/setup_other.cpp:90
 msgid "Auto fix position"
@@ -2001,7 +2001,7 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:103
 msgid "Player"
-msgstr ""
+msgstr "Speler"
 
 #: src/gui/setup_other.cpp:105
 msgid "Show own hp bar"
@@ -2053,7 +2053,7 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:148
 msgid "Other"
-msgstr ""
+msgstr "Andere"
 
 #: src/gui/setup_other.cpp:150
 msgid "Enable server side attack"
@@ -2081,7 +2081,7 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:168
 msgid "Show background"
-msgstr ""
+msgstr "Toon achtergrond"
 
 #: src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
@@ -2213,7 +2213,7 @@ msgstr "Oud"
 
 #: src/gui/setup_relations.cpp:246
 msgid "Relations"
-msgstr ""
+msgstr "Relaties"
 
 #: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
@@ -2364,12 +2364,12 @@ msgstr "als deeltje"
 
 #: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr ""
+msgstr "FPS limiet:"
 
 #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
 #: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
-msgstr ""
+msgstr "Alt FPS limiet: "
 
 #: src/gui/setup_video.cpp:315
 msgid "Video"
@@ -2401,11 +2401,15 @@ msgstr "Geen"
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
+"Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus "
+"faalde ook!"
 
 #: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
+"Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude "
+"modus faalde ook!"
 
 #: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
@@ -2587,7 +2591,7 @@ msgstr "Nav"
 
 #: src/gui/socialwindow.cpp:799
 msgid "Atk"
-msgstr ""
+msgstr "Aanv"
 
 #: src/gui/socialwindow.cpp:840
 msgid "Priority mobs"
@@ -2713,35 +2717,35 @@ msgstr ""
 
 #: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
-msgstr ""
+msgstr "(D) standaard bewegingen"
 
 #: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
-msgstr ""
+msgstr "(I) geïnverteerde bewegingen"
 
 #: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
-msgstr ""
+msgstr "(c) bewegingen met enkele vreemde bewegingen"
 
 #: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
-msgstr ""
+msgstr "(C) bewegingen met vreemde bewegingen"
 
 #: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
-msgstr ""
+msgstr "(d) dubbel normaal + raar"
 
 #: src/gui/statuspopup.cpp:222
 msgid "(?) move"
-msgstr ""
+msgstr "(?) beweeg"
 
 #: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
-msgstr ""
+msgstr "(a) manuele vreemde beweging"
 
 #: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
-msgstr ""
+msgstr "(?) vreemde beweging"
 
 #: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
@@ -2777,171 +2781,171 @@ msgstr "(?) beweeg tot aan doel"
 
 #: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
-msgstr ""
+msgstr "(D) standaard volgen"
 
 #: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
-msgstr ""
+msgstr "(R) relatief volgen"
 
 #: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
-msgstr ""
+msgstr "(M) gespiegeld volgen"
 
 #: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
-msgstr ""
+msgstr "(P) huisdier volgen"
 
 #: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
-msgstr ""
+msgstr "(?) onbekend volgen"
 
 #: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
-msgstr ""
+msgstr "(D) standaard aanval"
 
 #: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
-msgstr ""
+msgstr "(s) wissel aanval zonder schild"
 
 #: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
-msgstr ""
+msgstr "(S) wissel aanval met schild"
 
 #: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
-msgstr ""
+msgstr "(?) aanval"
 
 #: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
-msgstr ""
+msgstr "(G) ga en val aan"
 
 #: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
-msgstr ""
+msgstr "(A) ga, val aan, raap op"
 
 #: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
-msgstr ""
+msgstr "(d) zonder auto aanval"
 
 #: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
-msgstr ""
+msgstr "(S) klein raap op 1x1 velden"
 
 #: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
-msgstr ""
+msgstr "(D) standaard raap op 2x1 velden"
 
 #: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
-msgstr ""
+msgstr "(F) vooruit raap op 2x3 velden"
 
 #: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
-msgstr ""
+msgstr "(3) raap op 3x3 velden"
 
 #: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
-msgstr ""
+msgstr "(g) go en raap op met bereik 4"
 
 #: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
-msgstr ""
+msgstr "(G) ga en raap op met bereik 8"
 
 #: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
-msgstr ""
+msgstr "(A) ga en raap op zonder bereiklimiet"
 
 #: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
-msgstr ""
+msgstr "(?) raap op"
 
 #: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
-msgstr ""
+msgstr "(N) normale map tonen"
 
 #: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
-msgstr ""
+msgstr "(D) debug map tonen"
 
 #: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
-msgstr ""
+msgstr "(u) ultra map tonen"
 
 #: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
-msgstr ""
+msgstr "(U) ultra map tonen 2"
 
 #: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
-msgstr ""
+msgstr "(e) lege map tonen"
 
 #: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
-msgstr ""
+msgstr "(b) zwart & witte map tonen"
 
 #: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
-msgstr ""
+msgstr "(?) map tonen"
 
 #: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
-msgstr ""
+msgstr "(f) gebruik #flar voor magie aanval"
 
 #: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
-msgstr ""
+msgstr "(c) gebruik #chiza voor magie aanval"
 
 #: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
-msgstr ""
+msgstr "(I) gebruik #ingrav voor magie aanval"
 
 #: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
-msgstr ""
+msgstr "(F) gebruik #frillyar voor magie aanval"
 
 #: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
-msgstr ""
+msgstr "(U) gebruik #upmarmu voor magie aanval"
 
 #: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
-msgstr ""
+msgstr "(?) magie aanval"
 
 #: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
-msgstr ""
+msgstr "(D) standaard imitatie"
 
 #: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
-msgstr ""
+msgstr "(O) kleren imitatie"
 
 #: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
-msgstr ""
+msgstr "(?) imitatie"
 
 #: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
-msgstr ""
+msgstr "(O) op toetsenbord"
 
 #: src/gui/statuspopup.cpp:497
 msgid "(A) away"
-msgstr ""
+msgstr "(A) weg"
 
 #: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
-msgstr ""
+msgstr "(?) weg"
 
 #: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
-msgstr ""
+msgstr "(G) spel camera modus"
 
 #: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
-msgstr ""
+msgstr "(F) vrije camera modus"
 
 #: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
-msgstr ""
+msgstr "(D) design camera modus"
 
 #: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
@@ -3004,23 +3008,23 @@ msgstr ""
 #: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
 #: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
 msgid "(D)"
-msgstr ""
+msgstr "(D)"
 
 #: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
 msgid "(I)"
-msgstr ""
+msgstr "(I)"
 
 #: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
 msgid "(c)"
-msgstr ""
+msgstr "(c)"
 
 #: src/gui/statuswindow.cpp:655
 msgid "(C)"
-msgstr ""
+msgstr "(C)"
 
 #: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
 msgid "(d)"
-msgstr ""
+msgstr "(d)"
 
 #: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
 #: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
@@ -3029,102 +3033,102 @@ msgstr ""
 #: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
 #: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
 msgid "(?)"
-msgstr ""
+msgstr "(?)"
 
 #: src/gui/statuswindow.cpp:672
 msgid "(a)"
-msgstr ""
+msgstr "(a)"
 
 #: src/gui/statuswindow.cpp:683
 msgid "(0)"
-msgstr ""
+msgstr "(0)"
 
 #: src/gui/statuswindow.cpp:686
 msgid "(1)"
-msgstr ""
+msgstr "(1)"
 
 #: src/gui/statuswindow.cpp:689
 msgid "(2)"
-msgstr ""
+msgstr "(2)"
 
 #: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
 msgid "(3)"
-msgstr ""
+msgstr "(3)"
 
 #: src/gui/statuswindow.cpp:695
 msgid "(5)"
-msgstr ""
+msgstr "(5)"
 
 #: src/gui/statuswindow.cpp:698
 msgid "(7)"
-msgstr ""
+msgstr "(7)"
 
 #: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
 #: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
 msgid "(A)"
-msgstr ""
+msgstr "(A)"
 
 #: src/gui/statuswindow.cpp:714
 msgid "(R)"
-msgstr ""
+msgstr "(R)"
 
 #: src/gui/statuswindow.cpp:717
 msgid "(M)"
-msgstr ""
+msgstr "(M)"
 
 #: src/gui/statuswindow.cpp:720
 msgid "(P)"
-msgstr ""
+msgstr "(P)"
 
 #: src/gui/statuswindow.cpp:734
 msgid "(s)"
-msgstr ""
+msgstr "(s)"
 
 #: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
 msgid "(S)"
-msgstr ""
+msgstr "(S)"
 
 #: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
 #: src/gui/statuswindow.cpp:858
 msgid "(G)"
-msgstr ""
+msgstr "(G)"
 
 #: src/gui/statuswindow.cpp:766
 msgid "(f)"
-msgstr ""
+msgstr "(f)"
 
 #: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
 #: src/gui/statuswindow.cpp:861
 msgid "(F)"
-msgstr ""
+msgstr "(F)"
 
 #: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
 msgid "(U)"
-msgstr ""
+msgstr "(U)"
 
 #: src/gui/statuswindow.cpp:802
 msgid "(g)"
-msgstr ""
+msgstr "(g)"
 
 #: src/gui/statuswindow.cpp:819
 msgid "(N)"
-msgstr ""
+msgstr "(N)"
 
 #: src/gui/statuswindow.cpp:825
 msgid "(u)"
-msgstr ""
+msgstr "(u)"
 
 #: src/gui/statuswindow.cpp:831
 msgid "(e)"
-msgstr ""
+msgstr "(e)"
 
 #: src/gui/statuswindow.cpp:834
 msgid "(b)"
-msgstr ""
+msgstr "(b)"
 
 #: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
 msgid "(O)"
-msgstr ""
+msgstr "(O)"
 
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
@@ -3184,7 +3188,7 @@ msgstr "Commando:"
 
 #: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
-msgstr ""
+msgstr "Mana:"
 
 #: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
@@ -3192,7 +3196,7 @@ msgstr "Doel Type:"
 
 #: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
-msgstr ""
+msgstr "Icoon:"
 
 #: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
@@ -3243,16 +3247,16 @@ msgstr "Je geeft:"
 msgid "Change"
 msgstr "Veranderen"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "Je hebt niet genoeg geld."
+
+#: src/gui/tradewindow.cpp:453
 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:377
-msgid "You don't have enough money."
-msgstr "Je hebt niet genoeg geld."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
@@ -3606,15 +3610,15 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
-msgstr ""
+msgstr "BC"
 
 #: src/gui/windowmenu.cpp:65
 msgid "Bot checker"
-msgstr ""
+msgstr "Bot controle"
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
-msgstr ""
+msgstr "ONL"
 
 #: src/gui/windowmenu.cpp:67
 msgid "Who is online"
@@ -3630,7 +3634,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
-msgstr ""
+msgstr "STA"
 
 #: src/gui/windowmenu.cpp:73
 msgid "Status"
@@ -3646,7 +3650,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:81
 msgid "SKI"
-msgstr ""
+msgstr "VAAR"
 
 #: src/gui/windowmenu.cpp:88
 msgid "SPE"
@@ -3654,7 +3658,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:93
 msgid "SOC"
-msgstr ""
+msgstr "SOC"
 
 #: src/gui/windowmenu.cpp:94
 msgid "SH"
@@ -3674,15 +3678,15 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:98
 msgid "YK"
-msgstr ""
+msgstr "WU"
 
 #: src/gui/windowmenu.cpp:98
 msgid "Did you know"
-msgstr ""
+msgstr "Weet u"
 
 #: src/gui/windowmenu.cpp:100
 msgid "SET"
-msgstr ""
+msgstr "OPT"
 
 #: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
@@ -3696,11 +3700,11 @@ msgstr "Wijzig Login"
 msgid "Choose World"
 msgstr "Kies Wereld"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
@@ -3790,7 +3794,7 @@ msgstr "Handelen inschakelen/uitschakelen"
 
 #: src/keyboardconfig.cpp:78
 msgid "Change Map View Mode"
-msgstr ""
+msgstr "Wijzig Map Tonen Modus"
 
 #: src/keyboardconfig.cpp:80
 msgid "Item Shortcuts Key"
@@ -3853,7 +3857,7 @@ msgstr "Debugvenster"
 
 #: src/keyboardconfig.cpp:142
 msgid "Social Window"
-msgstr ""
+msgstr "Sociaal Venster"
 
 #: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
@@ -3861,7 +3865,7 @@ msgstr "Emoticonsnelkoppelingsvenster"
 
 #: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
-msgstr ""
+msgstr "Kleren Venster"
 
 #: src/keyboardconfig.cpp:148
 msgid "Shop Window"
@@ -3877,19 +3881,19 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:154
 msgid "Commands Window"
-msgstr ""
+msgstr "Commando Venster"
 
 #: src/keyboardconfig.cpp:156
 msgid "Bot Checker Window"
-msgstr ""
+msgstr "Bot Controle Venster"
 
 #: src/keyboardconfig.cpp:159
 msgid "Who Is Online Window"
-msgstr ""
+msgstr "Wie Is Online Venster"
 
 #: src/keyboardconfig.cpp:161
 msgid "Did you know Window"
-msgstr ""
+msgstr "Weet u Venster"
 
 #: src/keyboardconfig.cpp:164
 msgid "Previous Social Tab"
@@ -4093,68 +4097,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
-msgstr ""
+msgstr "U bent gedoodt door "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "U raapte op %d [@@%d|%s@@]."
+msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
-msgstr ""
+msgstr "Weg"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
-msgstr ""
+msgstr "Volg: "
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
-msgstr ""
+msgstr "Volgen onderbroken"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
-msgstr ""
+msgstr "Imitatie: "
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
-msgstr ""
+msgstr "Imitatie onderbroken"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr ""
 
@@ -4172,7 +4176,7 @@ msgstr "              om manuele parameters te gebruiken"
 
 #: src/main.cpp:50
 msgid "              to the manaplus client."
-msgstr ""
+msgstr "              aan de manaplus client."
 
 #: src/main.cpp:52
 msgid "Options:"
@@ -4289,6 +4293,8 @@ msgstr "Geluk:"
 #: src/net/ea/charserverhandler.cpp:102
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
+"Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze "
+"server."
 
 #: src/net/ea/charserverhandler.cpp:106
 msgid "Cannot use this ID."
@@ -4296,7 +4302,7 @@ msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:109
 msgid "Unknown char-server failure."
-msgstr ""
+msgstr "Onbekende char-server fout."
 
 #: src/net/ea/charserverhandler.cpp:138
 msgid "Failed to create character. Most likely the name is already taken."
@@ -4304,15 +4310,15 @@ msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
 
 #: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
 msgid "Wrong name."
-msgstr ""
+msgstr "Verkeerde naam."
 
 #: src/net/ea/charserverhandler.cpp:145
 msgid "Incorrect stats."
-msgstr ""
+msgstr "Ongeldige statistieken."
 
 #: src/net/ea/charserverhandler.cpp:148
 msgid "Incorrect hair."
-msgstr ""
+msgstr "Ongeldig haar."
 
 #: src/net/ea/charserverhandler.cpp:151
 msgid "Incorrect slot."
@@ -4358,15 +4364,15 @@ msgstr ""
 #: src/net/ea/gamehandler.cpp:86
 #, c-format
 msgid "Online users: %d"
-msgstr ""
+msgstr "Online gebruikers: %d"
 
 #: src/net/ea/gamehandler.cpp:98
 msgid "Game"
-msgstr ""
+msgstr "Spel"
 
 #: src/net/ea/gamehandler.cpp:98
 msgid "Request to quit denied!"
-msgstr ""
+msgstr "Aanvraag op de stoppen is geweigerd!"
 
 #: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
 msgid "Command: /invite <nick>"
@@ -4625,18 +4631,18 @@ msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
 
 #: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
-msgstr ""
+msgstr "Oud wachtwoord is ongeldig."
 
 #: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr ""
+msgstr "Nieuw wachtwoord is te kort."
 
 #: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr ""
+msgstr "Onbekende fout."
 
 #: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
@@ -4644,7 +4650,7 @@ msgstr ""
 
 #: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr ""
+msgstr "Verkeerd wachtwoord."
 
 #: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
@@ -4652,7 +4658,7 @@ msgstr ""
 
 #: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
-msgstr ""
+msgstr "Geweigered door de server."
 
 #: src/net/ea/loginhandler.cpp:217
 msgid ""
@@ -4661,7 +4667,7 @@ msgstr ""
 
 #: src/net/ea/loginhandler.cpp:221
 msgid "Client too old."
-msgstr ""
+msgstr "Client is te oud."
 
 #: src/net/ea/loginhandler.cpp:224
 #, c-format
@@ -4678,11 +4684,11 @@ msgstr ""
 
 #: src/net/ea/loginhandler.cpp:234
 msgid "This user name is already taken."
-msgstr ""
+msgstr "Deze gebruikersnaam is al genomen."
 
 #: src/net/ea/loginhandler.cpp:240
 msgid "Username permanently erased."
-msgstr ""
+msgstr "Gebruikersnaam is compleet verwijderd"
 
 #: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
@@ -4796,7 +4802,7 @@ msgstr "Verslagen"
 
 #: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
-msgstr ""
+msgstr "Het ziet ernaar uit dat je je pijp aan Maarten mag geven."
 
 #: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
@@ -5035,7 +5041,7 @@ msgstr "Kracht"
 #: src/net/manaserv/attributes.cpp:167
 #, c-format
 msgid "Strength %+.1f"
-msgstr ""
+msgstr "Kracht %+.1f"
 
 #: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
 msgid "Agility"
@@ -5044,16 +5050,16 @@ msgstr "Behendigheid"
 #: src/net/manaserv/attributes.cpp:180
 #, c-format
 msgid "Agility %+.1f"
-msgstr ""
+msgstr "Behendigheid %+.1f"
 
 #: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
 msgid "Dexterity"
-msgstr "Vaardigheid"
+msgstr "Handigheid"
 
 #: src/net/manaserv/attributes.cpp:193
 #, c-format
 msgid "Dexterity %+.1f"
-msgstr ""
+msgstr "Handigheid %+.1f"
 
 #: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
 msgid "Vitality"
@@ -5062,7 +5068,7 @@ msgstr "Vitaliteit"
 #: src/net/manaserv/attributes.cpp:206
 #, c-format
 msgid "Vitality %+.1f"
-msgstr ""
+msgstr "Vitality %+.1f"
 
 #: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
 msgid "Intelligence"
@@ -5071,16 +5077,16 @@ msgstr "Intelligentie"
 #: src/net/manaserv/attributes.cpp:219
 #, c-format
 msgid "Intelligence %+.1f"
-msgstr ""
+msgstr "Intelligentie %+.1f"
 
 #: src/net/manaserv/attributes.cpp:225
 msgid "Willpower"
-msgstr ""
+msgstr "Wilskracht"
 
 #: src/net/manaserv/attributes.cpp:232
 #, c-format
 msgid "Willpower %+.1f"
-msgstr ""
+msgstr "Wilskracht %+.1f"
 
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
@@ -5088,11 +5094,11 @@ msgstr "Klik OK om opnieuw te verschijnen."
 
 #: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
-msgstr ""
+msgstr "Je bent gestorven"
 
 #: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
-msgstr ""
+msgstr "Niet ingelogd"
 
 #: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
@@ -5100,31 +5106,31 @@ msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
-msgstr ""
+msgstr "Ongeldige naam."
 
 #: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
-msgstr ""
+msgstr "Naam van personage bestaat al."
 
 #: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
-msgstr ""
+msgstr "Ongeldige haarstijl."
 
 #: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
-msgstr ""
+msgstr "Ongeldige haarkleur."
 
 #: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
-msgstr ""
+msgstr "Ongeldig geslacht."
 
 #: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
-msgstr ""
+msgstr "Statistieken van personage zijn te hoog."
 
 #: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
-msgstr ""
+msgstr "Statistieken van personage zijn te laag."
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
@@ -5137,7 +5143,7 @@ msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
-msgstr ""
+msgstr "Speler verwijderd."
 
 #: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
@@ -5146,7 +5152,7 @@ msgstr ""
 #: src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
-msgstr ""
+msgstr "Onbekende fout (%d)."
 
 #: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
@@ -5160,47 +5166,47 @@ msgstr "Onderwerp: %s"
 
 #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
-msgstr ""
+msgstr "Spelers in dit kanaal:"
 
 #: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr ""
+msgstr "Fout bij binnenkomen ruimte."
 
 #: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
-msgstr ""
+msgstr "Lijst van ruimtes."
 
 #: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
-msgstr ""
+msgstr "Einde van lijst van ruimtes."
 
 #: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
-msgstr ""
+msgstr "%s is de ruimte binnengekomen."
 
 #: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
-msgstr ""
+msgstr "%s verliet de ruimte."
 
 #: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
-msgstr ""
+msgstr "%s heeft modus %s gezet op gebruiker %s."
 
 #: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
-msgstr ""
+msgstr "%s heeft %s eruit geschopt."
 
 #: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr ""
+msgstr "Onbekend ruimte gebeurtenis."
 
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
-msgstr "Fout bij het creëren van guild."
+msgstr "Fout bij aanmaken guild."
 
 #: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
@@ -5216,11 +5222,11 @@ msgstr "Kon lid niet promoveren."
 
 #: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
-msgstr ""
+msgstr "Verkeerd magic_token."
 
 #: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
-msgstr ""
+msgstr "Je bent al ingelogd."
 
 #: src/net/manaserv/loginhandler.cpp:99
 msgid "Account banned."
@@ -5228,7 +5234,7 @@ msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
-msgstr ""
+msgstr "Nieuw wachtwoord is ongeldig."
 
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
@@ -5236,15 +5242,15 @@ msgstr "Account niet verbonden. Log eerst in aub."
 
 #: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
-msgstr ""
+msgstr "Nieuw email adres is ongeldig."
 
 #: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
-msgstr ""
+msgstr "Oud email adres is ongeldig."
 
 #: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
-msgstr ""
+msgstr "Het nieuwe email adres bestaat reeds."
 
 #: src/net/manaserv/loginhandler.cpp:249
 msgid ""
@@ -5254,11 +5260,11 @@ msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
-msgstr ""
+msgstr "Client versie is te oud."
 
 #: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
-msgstr ""
+msgstr "Verkeerde gebruikersnaam of wachtwoord."
 
 #: src/net/manaserv/loginhandler.cpp:284
 msgid "Account banned"
@@ -5270,15 +5276,15 @@ msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
-msgstr ""
+msgstr "Verkeerde gebruikersnaam, wachtwoord of email adres."
 
 #: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
-msgstr ""
+msgstr "Gebruikersnaam bestaat al."
 
 #: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
-msgstr ""
+msgstr "Email adres bestaat al."
 
 #: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
@@ -5296,7 +5302,7 @@ msgstr "%s heeft zich bij de groep gevoegd."
 #: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
-msgstr ""
+msgstr "%s heeft uw uitnodiging geweigerd."
 
 #: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
@@ -5329,7 +5335,7 @@ msgstr "Kan niets verkopen."
 
 #: src/net/tmwa/buysellhandler.cpp:140
 msgid "Unable to sell while trading."
-msgstr ""
+msgstr "Kan niets verkopen terwijl je aan het handelen bent."
 
 #: src/net/tmwa/buysellhandler.cpp:143
 msgid "Unable to sell unsellable item."
@@ -5367,31 +5373,31 @@ msgstr "Geluk %+d"
 
 #: src/net/tmwa/generalhandler.cpp:140
 msgid "Authentication failed."
-msgstr ""
+msgstr "Authenticatie gefaald."
 
 #: src/net/tmwa/generalhandler.cpp:143
 msgid "No servers available."
-msgstr ""
+msgstr "Geen servers beschikbaar."
 
 #: src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
-msgstr ""
+msgstr "Iemand anders is aan het proberen deze account te gebruiken."
 
 #: src/net/tmwa/generalhandler.cpp:150
 msgid "This account is already logged in."
-msgstr ""
+msgstr "Deze account is al ingelogd."
 
 #: src/net/tmwa/generalhandler.cpp:153
 msgid "Speed hack detected."
-msgstr ""
+msgstr "Snelheidshack gedetecteerd."
 
 #: src/net/tmwa/generalhandler.cpp:156
 msgid "Duplicated login."
-msgstr ""
+msgstr "Verdubbelde login."
 
 #: src/net/tmwa/generalhandler.cpp:159
 msgid "Unknown connection error."
-msgstr ""
+msgstr "Onbekende connectiefout."
 
 #: src/net/tmwa/generalhandler.cpp:232
 msgid "Got disconnected from server!"
@@ -5403,25 +5409,25 @@ msgstr "Geluk"
 
 #: src/net/tmwa/generalhandler.cpp:267
 msgid "Defense"
-msgstr ""
+msgstr "Verdediging"
 
 #: src/net/tmwa/generalhandler.cpp:268
 msgid "M.Attack"
-msgstr ""
+msgstr "M.Aanval"
 
 #: src/net/tmwa/generalhandler.cpp:269
 msgid "M.Defense"
-msgstr ""
+msgstr "M.Verdediging"
 
 #: src/net/tmwa/generalhandler.cpp:271
 #, no-c-format
 msgid "% Accuracy"
-msgstr ""
+msgstr "% Nauwkeurigheid"
 
 #: src/net/tmwa/generalhandler.cpp:273
 #, no-c-format
 msgid "% Evade"
-msgstr ""
+msgstr "% Ontwijking"
 
 #: src/net/tmwa/generalhandler.cpp:275
 #, no-c-format
@@ -5430,27 +5436,27 @@ msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:276
 msgid "Attack Delay"
-msgstr ""
+msgstr "Aanvalsvertraging"
 
 #: src/net/tmwa/generalhandler.cpp:278
 msgid "Walk Delay"
-msgstr ""
+msgstr "Wandelvertraging"
 
 #: src/net/tmwa/generalhandler.cpp:280
 msgid "Attack Range"
-msgstr ""
+msgstr "Aanvalsbereik"
 
 #: src/net/tmwa/network.cpp:152
 msgid "Empty address given to Network::connect()!"
-msgstr ""
+msgstr "Leeg adres gegeven aan Network::connect()!"
 
 #: src/net/tmwa/network.cpp:356
 msgid "Unable to resolve host \""
-msgstr ""
+msgstr "Niet mogelijk te resolven van host \""
 
 #: src/net/tmwa/network.cpp:426
 msgid "Connection to server terminated. "
-msgstr ""
+msgstr "Verbinding met server beëindigd. "
 
 #: src/net/tmwa/partyhandler.cpp:171
 #, c-format
@@ -5459,19 +5465,19 @@ msgstr "%s is niet in jouw groep!"
 
 #: src/playerrelations.cpp:414
 msgid "Print '...'"
-msgstr ""
+msgstr "Say '...'"
 
 #: src/playerrelations.cpp:434
 msgid "Blink name"
-msgstr ""
+msgstr "Blink naam"
 
 #: src/playerrelations.cpp:478
 msgid "Floating '...' bubble"
-msgstr ""
+msgstr "Zwevende '...' bel"
 
 #: src/playerrelations.cpp:481
 msgid "Floating bubble"
-msgstr ""
+msgstr "Zwevende bel"
 
 #: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
 #: src/resources/monsterdb.cpp:84
diff --git a/po/pt.po b/po/pt.po
index b989aaf4e..513dc8b00 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-16 19:07+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-18 15:20+0000\n"
+"Last-Translator: freya <freya.df@gmail.com>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
 "pt/)\n"
 "Language: pt\n"
@@ -300,43 +300,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:487
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:495
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:535
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1203
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1210
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1596
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1597
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -902,11 +902,11 @@ msgstr "Abrir automaticamente esta janela"
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
 #: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
 #: src/gui/popupmenu.cpp:1783
@@ -918,7 +918,7 @@ msgid "Help"
 msgstr "Ajuda"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventário"
 
@@ -1429,7 +1429,7 @@ msgstr "A Remover"
 
 #: src/gui/popupmenu.cpp:508
 msgid "Warp"
-msgstr ""
+msgstr "Urdidura"
 
 #: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
@@ -2173,7 +2173,7 @@ msgstr "Ver status"
 
 #: src/gui/setup_players.cpp:78
 msgid "Show ip addresses on screenshots"
-msgstr ""
+msgstr "Mostrar endereço de ip nas capturas de tela"
 
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
@@ -2273,7 +2273,7 @@ msgstr "Fonte Segura"
 
 #: src/gui/setup_theme.cpp:151
 msgid "Japanese font"
-msgstr ""
+msgstr "Font Jasponesa"
 
 #: src/gui/setup_theme.cpp:183
 msgid "Font size"
@@ -3245,15 +3245,15 @@ msgstr "Você dá:"
 msgid "Change"
 msgstr "Mudar"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "Você não tem dinheiro suficiente."
+
+#: src/gui/tradewindow.cpp:453
 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:377
-msgid "You don't have enough money."
-msgstr "Você não tem dinheiro suficiente."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
@@ -3690,11 +3690,11 @@ msgstr "Trocar Login"
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "Armazém"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr "Carrinho"
 
@@ -4089,68 +4089,68 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "Você vê "
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f8646cbc4..f7a2bf6a1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-16 19:07+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"PO-Revision-Date: 2011-08-18 15:20+0000\n"
+"Last-Translator: freya <freya.df@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -302,43 +302,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:487
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:495
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:535
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1203
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1210
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1596
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1597
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -904,11 +904,11 @@ msgstr "Auto abrir esta janela"
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
 #: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
 #: src/gui/popupmenu.cpp:1783
@@ -920,7 +920,7 @@ msgid "Help"
 msgstr "Ajuda"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventário"
 
@@ -1431,7 +1431,7 @@ msgstr "Remover"
 
 #: src/gui/popupmenu.cpp:508
 msgid "Warp"
-msgstr ""
+msgstr "Urdidura"
 
 #: src/gui/popupmenu.cpp:522
 msgid "Load old outfits"
@@ -2175,7 +2175,7 @@ msgstr "Mostrar status"
 
 #: src/gui/setup_players.cpp:78
 msgid "Show ip addresses on screenshots"
-msgstr ""
+msgstr "Mostrar endereço de ip nas capturas de tela"
 
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
@@ -2275,7 +2275,7 @@ msgstr "Fonte segura"
 
 #: src/gui/setup_theme.cpp:151
 msgid "Japanese font"
-msgstr ""
+msgstr "Font Japonesa"
 
 #: src/gui/setup_theme.cpp:183
 msgid "Font size"
@@ -3247,15 +3247,15 @@ msgstr "Você dá:"
 msgid "Change"
 msgstr "Mudar"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "Você não tem dinheiro suficiente."
+
+#: src/gui/tradewindow.cpp:453
 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:377
-msgid "You don't have enough money."
-msgstr "Você não tem dinheiro suficiente."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
@@ -3692,11 +3692,11 @@ msgstr "Trocar Login"
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "Armazém"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr "Carrinho"
 
@@ -4091,68 +4091,68 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "Você vê "
 
diff --git a/po/ru.po b/po/ru.po
index 9b9772b33..4011f51f9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
 "PO-Revision-Date: 2011-08-16 16:10+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
@@ -308,43 +308,43 @@ msgstr ""
 "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
 "\"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "Общие"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "Отладка"
 
-#: src/game.cpp:487
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "Снимок экрана сохранен как "
 
-#: src/game.cpp:495
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/game.cpp:535
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:1203
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
-#: src/game.cpp:1210
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:1596
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1597
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
@@ -910,11 +910,11 @@ msgstr "Автоматически открывать это окно"
 msgid "OK"
 msgstr "ОК"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Снаряжение"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
 #: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
 #: src/gui/popupmenu.cpp:1783
@@ -926,7 +926,7 @@ msgid "Help"
 msgstr "Помощь"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Инвентарь"
 
@@ -3262,16 +3262,16 @@ msgstr "Вы отдаете:"
 msgid "Change"
 msgstr "Сменить"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:374
+msgid "You don't have enough money."
+msgstr "У вас недостаточно денег"
+
+#: src/gui/tradewindow.cpp:453
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr "У вас недостаточно денег"
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
@@ -3709,11 +3709,11 @@ msgstr "Сменить логин"
 msgid "Choose World"
 msgstr "Выберите сервер"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "Хранилище"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr "Телега"
 
@@ -4108,41 +4108,41 @@ msgstr ""
 "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
 "вести."
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr "Вы были убиты "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4150,27 +4150,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr "Имитация: "
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "Вы видите "
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1d6c18fdc..779f21790 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-16 19:07+0300\n"
+"POT-Creation-Date: 2011-08-20 17:42+0300\n"
 "PO-Revision-Date: 2011-08-16 16:09+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
@@ -291,43 +291,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
 msgid "Debug"
 msgstr "调试 "
 
-#: src/game.cpp:487
+#: src/game.cpp:488
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:495
+#: src/game.cpp:496
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:535
+#: src/game.cpp:536
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:547
+#: src/game.cpp:548
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1203
+#: src/game.cpp:1213
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:1210
+#: src/game.cpp:1220
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:1596
+#: src/game.cpp:1606
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1597
+#: src/game.cpp:1607
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -893,11 +893,11 @@ msgstr "自动打开这个窗口"
 msgid "OK"
 msgstr "确定"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "装备"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
 #: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
 #: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
 #: src/gui/popupmenu.cpp:1783
@@ -909,7 +909,7 @@ msgid "Help"
 msgstr "帮助"
 
 #: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "物品栏"
 
@@ -3229,14 +3229,14 @@ msgstr "你给予："
 msgid "Change"
 msgstr "改变"
 
-#: 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:377
+#: src/gui/tradewindow.cpp:374
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
+#: src/gui/tradewindow.cpp:453
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
+
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
@@ -3671,11 +3671,11 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr "仓库"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
@@ -4068,67 +4068,67 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:372
 msgid "You were killed by "
 msgstr "你被打死"
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1403
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1405
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1407
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1409
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1411
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1414
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1417
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3175
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3476
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3485
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3847
 msgid "You see "
 msgstr "你看"
 
-- 
cgit v1.2.3-70-g09d2