update translations.

author: Andrei Karas <akaras@inbox.ru> 2014-09-10 22:18:11 +0300
committer: Andrei Karas <akaras@inbox.ru> 2014-09-10 22:29:51 +0300
commit: df9dfd472e9f69ae27e2ab694e1897ef8a46a58f (patch)
tree: e794d21225318f599edf52b161f6271c15b9424c
parent: 30dd29914106af4dc98a191e95544d95f480c03d (diff)
download: plus-df9dfd472e9f69ae27e2ab694e1897ef8a46a58f.tar.gz
plus-df9dfd472e9f69ae27e2ab694e1897ef8a46a58f.tar.bz2
plus-df9dfd472e9f69ae27e2ab694e1897ef8a46a58f.tar.xz
plus-df9dfd472e9f69ae27e2ab694e1897ef8a46a58f.zip
38 files changed, 12137 insertions, 10613 deletions
diff --git a/po/ar.po b/po/ar.po
index 759657021..a6b884fff 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/manaplus/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -411,8 +411,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -485,9 +485,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -495,32 +495,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -534,50 +534,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "خطأ"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1197,8 +1197,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1472,20 +1472,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1509,7 +1509,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1523,49 +1523,49 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1583,9 +1583,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1594,7 +1594,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1605,7 +1605,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1618,7 +1618,7 @@ msgstr "شراء"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1628,26 +1628,26 @@ msgstr "بيع"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1655,7 +1655,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1663,44 +1663,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1710,20 +1710,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1732,7 +1732,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1740,69 +1740,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1812,85 +1812,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1899,64 +1899,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1966,51 +1966,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "استخدام"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2018,144 +2018,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2163,7 +2163,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "إسقاط"
@@ -2171,49 +2171,49 @@ msgstr "إسقاط"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "قسم"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2509,11 +2509,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3958,7 +3968,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4787,7 +4797,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "إنشاء"
@@ -4858,7 +4868,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr ""
 
@@ -5012,53 +5022,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "إلغاء التسجيل"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5068,16 +5082,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5720,7 +5734,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr ""
 
@@ -5735,19 +5749,19 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6072,7 +6086,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6082,17 +6096,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6366,39 +6380,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7167,111 +7220,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "القوّة:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "خفّة الحركة:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "نشاط:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "ذكاء:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "المهارة:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7391,43 +7450,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7435,327 +7495,327 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
+#. TRANSLATORS: trade header
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
+msgid "Trade: You and %s"
 msgstr ""
 
-#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
 #, c-format
-msgid "Trade: You and %s"
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: draw backend
@@ -7798,7 +7858,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index d27798b20..424b48abe 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/manaplus/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -481,9 +481,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -491,32 +491,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -530,50 +530,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1519,49 +1519,49 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1579,9 +1579,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1590,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,7 +1651,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1659,44 +1659,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1706,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1728,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1736,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1808,85 +1808,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1895,64 +1895,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1962,51 +1962,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2014,144 +2014,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2159,7 +2159,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2167,49 +2167,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2505,11 +2505,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3954,7 +3964,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4783,7 +4793,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr ""
@@ -4854,7 +4864,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr ""
 
@@ -5008,53 +5018,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5064,16 +5078,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5708,7 +5722,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr ""
 
@@ -5723,19 +5737,19 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6060,7 +6074,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6070,17 +6084,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6354,39 +6368,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7155,111 +7208,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7379,43 +7438,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7423,327 +7483,327 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
+#. TRANSLATORS: trade header
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
+msgid "Trade: You and %s"
 msgstr ""
 
-#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
 #, c-format
-msgid "Trade: You and %s"
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: draw backend
@@ -7786,7 +7846,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 4aa9915b8..f39fcdc05 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -44,110 +44,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Temps d'activitat del client: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "setmana %d"
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "Dia %d"
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "Hora %d"
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "Minut %d"
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "Segon  %d"
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -301,12 +301,12 @@ msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
@@ -408,8 +408,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr "Ignorar completament"
 
@@ -482,9 +482,9 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -492,32 +492,32 @@ msgid "Close"
 msgstr "Tancar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr "Connectant al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr "Iniciant sessió"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr "Entrant al mon de joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr "Sol·licitant personatges"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr "Connectant al servidor de joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr "Canviant servidors de joc"
 
@@ -531,50 +531,50 @@ msgstr "Canviant servidors de joc"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr "Sol·licitant detalls de registre"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr "Canvi de contrasenya"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr "Contrasenya canviada amb èxit!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr "Canvi de correu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr "Correu canviat amb èxit!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr "Registre anul·lat amb èxit"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr "Adéu, torna quan vulguis..."
 
@@ -1194,8 +1194,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1469,20 +1469,20 @@ msgstr "Crear grup"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1506,7 +1506,7 @@ msgstr "Pes: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Intercanvi"
@@ -1520,49 +1520,49 @@ msgstr "Intercanvi"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1580,9 +1580,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Moure"
@@ -1591,7 +1591,7 @@ msgstr "Moure"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Parlar"
@@ -1602,7 +1602,7 @@ msgstr "Parlar"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1615,7 +1615,7 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1625,26 +1625,26 @@ msgstr "Vendre"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1652,7 +1652,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1660,44 +1660,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Jugadors"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr "Afegir al xat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr "Element del mapa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1707,20 +1707,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1729,7 +1729,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1737,69 +1737,69 @@ msgstr "Conjunt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Conjurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Netejar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr "Desactivar ressaltat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr "Activa resaltat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr "Borrar nom"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr "Habilitar absència"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr "Des-habilita absència"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Deixa"
 
@@ -1809,85 +1809,85 @@ msgstr "Deixa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr "Canviar la posició del gremi"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr "Canviar el nom de la marca de mapa "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr "Nom:                     "
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr "Afegeix al intercanvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr "Agregar-ne 10 al intercanvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr "Agregar-ne la mitat al intercanvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr "Agregar-los tots al intercanvi"
 
@@ -1896,64 +1896,64 @@ msgstr "Agregar-los tots al intercanvi"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Botiga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr "Emmagatzema 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr "Emmagatzema la mitat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr "Emmagatzema-ho tot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Recuperar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr "Recupera 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr "Recuperar la mitat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr "Recupera-ho tot"
 
@@ -1963,51 +1963,51 @@ msgstr "Recupera-ho tot"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Utilitzar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr "Amagar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2015,144 +2015,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Deixar caure..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2160,7 +2160,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Deixar caure"
@@ -2168,49 +2168,49 @@ msgstr "Deixar caure"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2506,11 +2506,21 @@ msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivell: %d"
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3955,7 +3965,7 @@ msgstr "Permet xiuxiueigs"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4784,7 +4794,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "Crear"
@@ -4855,7 +4865,7 @@ msgstr "Les direccions de correu no coincideixen."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr "Canviar contrasenya"
 
@@ -5009,53 +5019,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Estàs segur que bols esborrar aquest personatge?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr "Canvia compta d'accés"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Juga"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr "Informació"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "No registrat"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr "Canvia correu"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5065,16 +5079,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5709,7 +5723,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr "Petició d'intercanvi"
 
@@ -5724,19 +5738,19 @@ msgid "Up"
 msgstr "Aumentar"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Punts d'habilitat restants: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilitats %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr "Habilitat %d"
@@ -6061,7 +6075,7 @@ msgid "Completed"
 msgstr "Complet"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Qui Està en Línia - Actualitzant"
 
@@ -6071,17 +6085,17 @@ msgid "Update"
 msgstr "Actualitza"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Qui Està En Línia - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Qui Està En Línia - error"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Qui Està En Línia - Actualitza"
 
@@ -6355,39 +6369,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Drecera d'emoticona %d"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7156,111 +7209,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7380,43 +7439,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr "Error desconegut."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7424,329 +7484,329 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr "Direcció buida enviada a Network::connect()!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr "No es pot resoldre el host \""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr "Connexió interrompuda amb el servidor. "
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr "Autenticació fallida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr "No hi ha cap servidor disponible."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr "Algú altre està provant d'utilitzar aquest compte."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr "Aquest compte ja està sent utilitzat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr "Hack de desplaçament ràpid detectat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr "Accès de sessió duplicat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr "Error de connexió desconegut."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr "Has estat desconnectat del servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr "Força"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr "Agilitat"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr "Vitalitat"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr "Intel·ligència"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr "Destresa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr "Sort"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr "Defensa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr "Atac màgic"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr "Defensa màgica"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% de Precisió"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr "% de Evasió"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr "% de Crític"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr "Retard d'atac"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr "Demora a peu"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr "Distància d'atac"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s bol un intercanvi amb tu, acceptes?"
-
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s bol un intercanvi amb tu, acceptes?"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7787,7 +7847,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sense nom"
diff --git a/po/cs.po b/po/cs.po
index e7bafcc12..7ab35baf3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-09-01 17:56+0000\n"
-"Last-Translator: samuraiii <samurai.no.dojo@gmail.com>\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 19:06+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
 "cs/)\n"
 "Language: cs\n"
@@ -174,7 +174,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Chybí jméno party."
 
@@ -407,7 +407,7 @@ msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr "Vidíš %s"
@@ -417,8 +417,8 @@ msgstr "Vidíš %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
@@ -492,8 +492,8 @@ msgstr "Nápověda"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -623,14 +623,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Obecný"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
@@ -1203,8 +1203,8 @@ msgstr "Maximální (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(výchozí)"
 
@@ -1478,20 +1478,20 @@ msgstr "Vytvořit partu"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1515,7 +1515,7 @@ msgstr "Váha: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Obchod"
@@ -1529,49 +1529,49 @@ msgstr "Obchod"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "Útok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "Šeptat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "Vyléčit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "Vykopnout z gildy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr "Změnit pozici v gildě"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr "Pozvat do gildy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr "Vyhladit"
 
@@ -1589,9 +1589,9 @@ msgstr "Vyhladit"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Jdi sem"
@@ -1600,7 +1600,7 @@ msgstr "Jdi sem"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Promluv"
@@ -1611,7 +1611,7 @@ msgstr "Promluv"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1624,7 +1624,7 @@ msgstr "Nákup"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1634,26 +1634,26 @@ msgstr "Prodej"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr "Přidat komentář"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr "Vyřadit ze seznamu útoku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "Přidat do prioritního seznamu útoku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "Přidat do seznamu útoku"
 
@@ -1661,7 +1661,7 @@ msgstr "Přidat do seznamu útoku"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "Vložit do seznamu ignorovaných"
 
@@ -1669,44 +1669,44 @@ msgstr "Vložit do seznamu ignorovaných"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Vložit jméno do chatu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Hráči"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "Vykopnout z party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "Sebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "Přidat do chatu"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "Označit na mapě"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "Přejmenovat"
 
@@ -1716,20 +1716,20 @@ msgstr "Přejmenovat"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr "Odebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr "Přesun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr "Přesunout kameru"
 
@@ -1738,7 +1738,7 @@ msgstr "Přesunout kameru"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1746,69 +1746,69 @@ msgstr "Výstroje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr "Vyčistit výstroj"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Kouzla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr "Upravit kouzlo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "Vypnout zvýrazňování"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "Zapnout zvýrazňování"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr "Neodebírat jméno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "Odebrat jméno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr "Zapnout \"away\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr "Vypnout \"away\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Opustit"
 
@@ -1818,85 +1818,79 @@ msgstr "Opustit"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr "Kopírovat do schránky"
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "Pozvat do party"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "Změň hodnost v guildě"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr "okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr "Odemknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr "Zamknout"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "Přejmenovat značku na mapě "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "Jméno:                   "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr "Hráčův komentář           "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr "Komentář:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr "Přidat k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr "Přidat 10 k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr "Přidat polovinu k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr "Vlož do obchodu vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr "Přidat vše k obchodu"
 
@@ -1905,64 +1899,64 @@ msgstr "Přidat vše k obchodu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Uložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "Uschovat 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "Uschovat polovinu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr "Ulož vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "Uschovat všechny"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Vzít"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "Vzít 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "Vzít polovinu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr "Vyber vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "Vzít všechny"
 
@@ -1972,7 +1966,7 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1982,41 +1976,41 @@ msgid "Use"
 msgstr "Použít"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr "Vyčistit okno upuštění"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr "Skrýt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "Zobrazit"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr "Resetovat žlutý pruh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "Posunout nahoru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr "Posunout dolů"
 
@@ -2024,144 +2018,150 @@ msgstr "Posunout dolů"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr "Svléknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr "Kopírovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr "Vložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr "Otevřít odkaz"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr "Zobrazit okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr "Přehlížet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr "Černá listina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr "Nastavit jako nepřítele"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "Být přátelé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "Odignorovat"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "Následovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "Imitace"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "Koupit (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "Prodat (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "Pozvat do party"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "Zobrazit předměty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr "Odeber ze seznamu sběru"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr "Přidej do seznamu sběru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr "Přestat chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr "Chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Upustit..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "Upustit vše"
 
@@ -2169,7 +2169,7 @@ msgstr "Upustit vše"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Upustit"
@@ -2177,49 +2177,49 @@ msgstr "Upustit"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Rozdělit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr "GM příkazy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr "Zkontrolovat ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr "Jdi na"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr "Zavolej zpět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Oživ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr "Vykopnout"
 
@@ -2521,14 +2521,14 @@ msgid "Lvl: %d"
 msgstr "Úroveň: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "Mana:"
+msgstr "Mana: -%d"
 
 #: src/gui/widgets/skillinfo.cpp:107
-#, fuzzy, c-format
+#, c-format
 msgid "Range: %d"
-msgstr "Dosah %s"
+msgstr "Dosah: %d"
 
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
@@ -2553,13 +2553,13 @@ msgid "%s whispers: %s"
 msgstr "%s šeptá: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr "%s je nyní připojen."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s se právě odpojil."
@@ -4516,7 +4516,7 @@ msgstr "Portály: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Parta"
 
@@ -5087,7 +5087,7 @@ msgstr "Účet %s"
 
 #: src/gui/windows/charselectdialog.cpp:186
 msgid "Please set new pincode"
-msgstr ""
+msgstr "Prosím nastavte nový pin kód"
 
 #. TRANSLATORS: char select dialog. player info message.
 #: src/gui/windows/charselectdialog.cpp:239
@@ -6396,9 +6396,8 @@ msgstr "Modifikátor Smajlíkových kláves"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
-#, fuzzy
 msgid "Pet emote modifier key"
-msgstr "Modifikátor Smajlíkových kláves"
+msgstr "Modifikátor Smajlíkových kláves mazlíčka"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:55
@@ -6436,9 +6435,8 @@ msgstr "Zkratka smajlíku %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "Zkratky smajlíků"
+msgstr "Zkratky smajlíků mazlíčka"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6465,9 +6463,9 @@ msgstr "Zkratky smajlíků"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "Zkratka smajlíku %d"
+msgstr "Zkratka smajlíka mazlíčka %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7345,9 +7343,8 @@ msgstr "Nelze odeslat šeptání, %s vás ignoruje."
 
 #. TRANSLATORS: chat message
 #: src/net/ea/chathandler.cpp:129
-#, fuzzy
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Nelze odeslat šeptání, %s vás ignoruje."
+msgstr "Šeptání nebylo možné zaslat, jsi ignorován všemi hráči."
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7414,47 +7411,47 @@ msgstr "Hrad gildy: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Sdílení předmětů povoleno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Sdílení předmětů zakázáno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Sdílení předmětů není možné."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr "Stav sdílení předmětů neznámý."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Sdílení zkušeností povoleno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Sdílení zkušeností zakázáno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Sdílení zkušeností není možné."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr "Stav sdílení zkušeností neznámý."
 
@@ -7674,161 +7671,161 @@ msgid "Poison had no effect..."
 msgstr "Jed nemá žádný účinek..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr "Síla %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr "Hbitost %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalita %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr "Obratnost %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr "Štěstí %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr "Ověření selhalo."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr "Nejsou dostupné žádné servery."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "Někdo jiný se pokouší používat tento účet."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "Tento účet je již přihlášen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr "Detekován podvod s rychlostí."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr "Duplicitní přihlášení."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr "Neznámá chyba připojení."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr "Byl jsem odpojen od server!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "Síla"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "Hbitost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "Vitalita"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "Inteligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "Obratnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "Štěstí"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr "Obrana"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr "Magický útok"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr "Magická Obr."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Přesnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr "% Uhnutí"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr "% Kritický zásah"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr "Zpoždění útoku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr "Zpoždění chůze"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr "Dosah útoku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr "Poškození za vteř."
 
@@ -8300,6 +8297,24 @@ msgstr "pvp zapnuto, gvg zapnuto"
 msgid "unknown pvp"
 msgstr "neznámý stav pvp"
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "%s není členem tvojí party!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "Kdo je online"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/de.po b/po/de.po
index fe0ad4ada..ba7cb8c11 100644
--- a/po/de.po
+++ b/po/de.po
@@ -29,8 +29,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 19:06+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
 "de/)\n"
@@ -189,7 +189,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Name der Gruppe fehlt."
 
@@ -421,7 +421,7 @@ msgid "Imitation canceled"
 msgstr "Imitation abgebrochen"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr "Du siehst %s"
@@ -431,8 +431,8 @@ msgstr "Du siehst %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "Ignoriere komplett"
 
@@ -506,8 +506,8 @@ msgstr "Hilfe"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -638,14 +638,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Allgemein"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
@@ -1218,8 +1218,8 @@ msgstr "Riesig (18)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(normal)"
 
@@ -1493,20 +1493,20 @@ msgstr "Gruppe erstellen"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1530,7 +1530,7 @@ msgstr "Gewicht: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Handeln"
@@ -1544,49 +1544,49 @@ msgstr "Handeln"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "Angriff"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "Flüstern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "Heilen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "Aus Gilde werfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr "Rang in Gilde ändern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr "In Gilde einladen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr "Atombombe"
 
@@ -1604,9 +1604,9 @@ msgstr "Atombombe"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Bewegen"
@@ -1615,7 +1615,7 @@ msgstr "Bewegen"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Sprechen"
@@ -1626,7 +1626,7 @@ msgstr "Sprechen"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1639,7 +1639,7 @@ msgstr "Kaufen"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1649,26 +1649,26 @@ msgstr "Verkaufen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr "Entferne aus Angriffsliste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "Hinzufügen zur bevorzugten Angriffsliste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "Hinzufügen zur normalen Angriffsliste"
 
@@ -1676,7 +1676,7 @@ msgstr "Hinzufügen zur normalen Angriffsliste"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "Hinzufügen zur Ignorierenliste"
 
@@ -1684,44 +1684,44 @@ msgstr "Hinzufügen zur Ignorierenliste"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Füge Name dem Chat hinzu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spieler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "Aus Gruppe werfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "Aufheben"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "Karteneinstellung"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -1731,20 +1731,20 @@ msgstr "Umbenennen"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr "Entfernen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr "Warp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr "Bewege Kamera"
 
@@ -1753,7 +1753,7 @@ msgstr "Bewege Kamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1761,69 +1761,69 @@ msgstr "Ausrüstung"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr "Leere Ausrüstungsfenster"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Zaubersprüche"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr "Bearbeite Zauberspruch"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Leeren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "Hervorhebung abschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "Hervorhebung einschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr "Lösche den Namen nicht"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "Lösche Name"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr "Aktiviere abwesend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr "Deaktiviere abwesend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Verlassen"
 
@@ -1833,85 +1833,79 @@ msgstr "Verlassen"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr "Kopiere in die Zwischenablage"
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "Lade zu Gruppe ein"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "Position der Gilde ändern"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "Kartenzeichen umbenennen "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "Name:                    "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr "Spieler Kommentar         "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr "Kommentar:                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr "Zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr "10 zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr "Die Hälfte zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr "Alles zum Handel hinzufügen-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr "Alles zum Handeln hinzufügen"
 
@@ -1920,64 +1914,64 @@ msgstr "Alles zum Handeln hinzufügen"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "10 aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "Die Hälfte aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr "Alles ablegen-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "Alles aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "10 abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "Die Hälfte abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr "Alles aufnehmen-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "Alles abholen"
 
@@ -1987,7 +1981,7 @@ msgstr "Alles abholen"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1997,41 +1991,41 @@ msgid "Use"
 msgstr "Benutzen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr "Fächer des Wegwerffensters leeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr "Verstecken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "Zeigen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr "Setze gelben Balken zurück"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Kopiere zu Chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "Nach oben"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr "Nach unten"
 
@@ -2039,144 +2033,150 @@ msgstr "Nach unten"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr "Ausziehen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr "Kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr "Einfügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr "Link öffnen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr "Fenster anzeigen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr "Missachten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr "Schwarze Liste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr "Als Feind setzen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr "Löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "Befreunden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "Nicht mehr Ignorieren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "Folgen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "Imitation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "Kaufen(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "Verkaufen(?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "Lade zu Gruppe ein"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "Zeige Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr "Von der Aufhebeliste entfernen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr "Zur Aufhebeliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Wegwerfen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "Alles fallenlassen"
 
@@ -2184,7 +2184,7 @@ msgstr "Alles fallenlassen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Wegwerfen"
@@ -2192,49 +2192,49 @@ msgstr "Wegwerfen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Aufteilen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr "Rauswerfen"
 
@@ -2536,9 +2536,9 @@ msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "Mana:"
+msgstr ""
 
 #: src/gui/widgets/skillinfo.cpp:107
 #, c-format
@@ -2568,13 +2568,13 @@ msgid "%s whispers: %s"
 msgstr "%s flüstert: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr "%s ist jetzt Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s ist jetzt Offline."
@@ -4529,7 +4529,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Gruppe"
 
@@ -6405,9 +6405,8 @@ msgstr "Gefühl Modifier-Taste"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
-#, fuzzy
 msgid "Pet emote modifier key"
-msgstr "Gefühl Modifier-Taste"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:55
@@ -6445,9 +6444,8 @@ msgstr "Gefühlstaste %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "Gefühle Kurzbefehlstasten"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6474,9 +6472,9 @@ msgstr "Gefühle Kurzbefehlstasten"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "Gefühlstaste %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7356,9 +7354,8 @@ msgstr "Konnte nicht flüstern. Ignoriert von %s."
 
 #. TRANSLATORS: chat message
 #: src/net/ea/chathandler.cpp:129
-#, fuzzy
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Konnte nicht flüstern. Ignoriert von %s."
+msgstr ""
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7425,47 +7422,47 @@ msgstr "Gildenburg: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Item-Sharing aktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Item-Sharing deaktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Item-Sharing ist nicht möglich."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr "Item-Sharing unbekannt."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Erfahrung teilen ist aktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Erfahrung teilen ist deaktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Erfahrung teilen nicht möglich."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr "Erfahrung teilen unbekannt."
 
@@ -7687,161 +7684,161 @@ msgid "Poison had no effect..."
 msgstr "Gift hatte kein Effekt..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr "Authentifizierung verweigert."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr "Keine Server verfügbar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "Jemand anderes versucht diesen Account zu benutzen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "Dieser Account ist bereits angemeldet."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr "Geschwindigkeitsproblem festgestellt."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr "Mehrfache Anmeldung."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr "Unbekannter Verbindungsfehler."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr "Verbindung zum Server unterbrochen!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "Stärke"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "Beweglichkeit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "Gesundheit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "Intelligenz"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "Geschicklichkeit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "Glück"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr "Verteidigung:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr "M.Angriff:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr "M.Verteidigung:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Genauigkeit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr "% Ausweichen"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr "% Kritisch"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr "Angriffsverzögerung"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr "Lauf-Verzögerung:"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr "Angriffsreichweite"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr "Schaden pro Sek."
 
@@ -8317,6 +8314,24 @@ msgstr "PvP an, GvG an"
 msgid "unknown pvp"
 msgstr "unbekanntes PvP"
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "%s ist nicht in Deiner Gruppe!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "Wer ist Online"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/en_GB.po b/po/en_GB.po
index 0c8616d3a..b8cb3a56b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/manaplus/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -44,110 +44,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -301,12 +301,12 @@ msgid "miss"
 msgstr "miss"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -408,8 +408,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -482,9 +482,9 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -492,32 +492,32 @@ msgid "Close"
 msgstr "Close"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr "Connecting to server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr "Logging in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr "Entering game world"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr "Requesting characters"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr "Connecting to the game server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr "Changing game servers"
 
@@ -531,50 +531,50 @@ msgstr "Changing game servers"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr "Requesting registration details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr "Password Change"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1194,8 +1194,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1469,20 +1469,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1506,7 +1506,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Trade"
@@ -1520,49 +1520,49 @@ msgstr "Trade"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr "Attack"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1580,9 +1580,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1591,7 +1591,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Talk"
@@ -1602,7 +1602,7 @@ msgstr "Talk"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1615,7 +1615,7 @@ msgstr "Buy"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1625,26 +1625,26 @@ msgstr "Sell"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1652,7 +1652,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1660,44 +1660,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Players"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1707,20 +1707,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1729,7 +1729,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1737,69 +1737,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1809,85 +1809,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1896,64 +1896,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Store"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Retrieve"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1963,51 +1963,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Use"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2015,144 +2015,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2160,7 +2160,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Drop"
@@ -2168,49 +2168,49 @@ msgstr "Drop"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Split"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2506,11 +2506,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3955,7 +3965,7 @@ msgstr "Allow whispers"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4784,7 +4794,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "Create"
@@ -4855,7 +4865,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr "Change Password"
 
@@ -5009,53 +5019,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Are you sure you want to delete this character?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Play"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Unregister"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5065,16 +5079,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5709,7 +5723,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr "Request for Trade"
 
@@ -5724,19 +5738,19 @@ msgid "Up"
 msgstr "Up"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6061,7 +6075,7 @@ msgid "Completed"
 msgstr "Completed"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6071,17 +6085,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6355,39 +6369,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emote Shortcut %d"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7156,111 +7209,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7380,43 +7439,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7424,329 +7484,329 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr "Disconnected from server!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr "Strength"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr "Agility"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr "Vitality"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr "Dexterity"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr "Luck"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s wants to trade with you, do you accept?"
-
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s wants to trade with you, do you accept?"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7787,7 +7847,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "unnamed"
diff --git a/po/eo.po b/po/eo.po
index 2c05d7dda..905a07779 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/manaplus/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -44,110 +44,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -301,12 +301,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
@@ -408,8 +408,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -482,9 +482,9 @@ msgstr "Helpo"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -492,32 +492,32 @@ msgid "Close"
 msgstr "Fermi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -531,50 +531,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "Eraro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1194,8 +1194,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1469,20 +1469,20 @@ msgstr "Krei partion"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1506,7 +1506,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1520,49 +1520,49 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr "Sanigi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1580,9 +1580,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Movi"
@@ -1591,7 +1591,7 @@ msgstr "Movi"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Paroli"
@@ -1602,7 +1602,7 @@ msgstr "Paroli"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1615,7 +1615,7 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1625,26 +1625,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1652,7 +1652,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1660,44 +1660,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Ludantoj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1707,20 +1707,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1729,7 +1729,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1737,69 +1737,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Forlasi"
 
@@ -1809,85 +1809,85 @@ msgstr "Forlasi"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr "Nomo:                    "
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1896,64 +1896,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1963,51 +1963,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Uzi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2015,144 +2015,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr "Forigi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr "Malignori"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr "Sekvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr "Imitado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2160,7 +2160,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2168,49 +2168,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2506,11 +2506,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3955,7 +3965,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4784,7 +4794,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "Krei"
@@ -4855,7 +4865,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr ""
 
@@ -5009,53 +5019,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Ludi"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5065,16 +5079,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5709,7 +5723,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr ""
 
@@ -5724,19 +5738,19 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6061,7 +6075,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6071,17 +6085,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6355,39 +6369,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7156,111 +7209,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Forto:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Rapideco:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Lerteco:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr "Nekorekta nomo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr "Nekorekta haro."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7380,43 +7439,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr "Nekonata eraro."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7424,327 +7484,327 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr "Forto"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr "Rapideco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr "Lerteco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
+#. TRANSLATORS: trade header
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
+msgid "Trade: You and %s"
 msgstr ""
 
-#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
 #, c-format
-msgid "Trade: You and %s"
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: draw backend
@@ -7787,7 +7847,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sennoma"
diff --git a/po/es.po b/po/es.po
index 6598e7260..107a14582 100644
--- a/po/es.po
+++ b/po/es.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 19:08+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
 "language/es/)\n"
@@ -179,7 +179,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
@@ -411,7 +411,7 @@ msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr "Tú ves %s"
@@ -421,8 +421,8 @@ msgstr "Tú ves %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -496,8 +496,8 @@ msgstr "Ayuda"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -627,14 +627,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd archivoOrigen archivoDestino"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
@@ -1207,8 +1207,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -1482,20 +1482,20 @@ msgstr "Crear grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1519,7 +1519,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Intercambio"
@@ -1533,49 +1533,49 @@ msgstr "Intercambio"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "Susurrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "Curar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "Expulsar del gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr "Cambiar posición en el gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr "Invitar al gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr "Eliminar"
 
@@ -1593,9 +1593,9 @@ msgstr "Eliminar"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Mover"
@@ -1604,7 +1604,7 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Hablar"
@@ -1615,7 +1615,7 @@ msgstr "Hablar"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1628,7 +1628,7 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1638,26 +1638,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr "Agregar comentario"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr "Remover de la lista de ataque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "Añadir a la lista de ataque prioritario"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "Agregar a la lista de ataque"
 
@@ -1665,7 +1665,7 @@ msgstr "Agregar a la lista de ataque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
@@ -1673,44 +1673,44 @@ msgstr "Agregar a la lista de ignorados"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Jugadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "Expulsar del grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "Recoger"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "Renombrar"
 
@@ -1720,20 +1720,20 @@ msgstr "Renombrar"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr "Quitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr "Deformar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr "Mover cámara"
 
@@ -1742,7 +1742,7 @@ msgstr "Mover cámara"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1750,69 +1750,69 @@ msgstr "Vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr "Limpiar vestimenta"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Hechizos"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr "Editar hechizo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Limpiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr "No remover nombre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "Remover nombre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Dejar"
 
@@ -1822,85 +1822,79 @@ msgstr "Dejar"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "Invitar al grupo"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "Cambiar posición del gremio"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr "ventana"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr "Desbloquear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr "Bloquear"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "Nombre:                  "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr "Comentario del jugador    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr "Comentario:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr "Agregar al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr "Agregar el intercambio todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
@@ -1909,64 +1903,64 @@ msgstr "Agregar todo al intercambio"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Almacenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "Almacenar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr "Almacenar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "Almacenar todo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Recuperar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr "Recuperar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
@@ -1976,7 +1970,7 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1986,41 +1980,41 @@ msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr "Limpiar ventana de lanzamiento"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "Subir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr "Bajar"
 
@@ -2028,144 +2022,150 @@ msgstr "Bajar"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr "Desvestir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr "Abrir enlace"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr "Mostrar ventana"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr "Desatender"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr "Lista negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr "Fijar como enemigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr "Borrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "Ser amigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "Imitación"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "Invitar al grupo"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "Mostrar vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr "Remover de lista de recogido"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr "Agregar a lista de recogido"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr "Desproteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr "Proteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Tirar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "Tirar todo"
 
@@ -2173,7 +2173,7 @@ msgstr "Tirar todo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Tirar"
@@ -2181,49 +2181,49 @@ msgstr "Tirar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr "Comandos GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr "Chequear IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr "Ir a"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr "Llamar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Revivir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr "Expulsar"
 
@@ -2525,9 +2525,9 @@ msgid "Lvl: %d"
 msgstr "Nivel: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "Maná:"
+msgstr ""
 
 #: src/gui/widgets/skillinfo.cpp:107
 #, c-format
@@ -2557,13 +2557,13 @@ msgid "%s whispers: %s"
 msgstr "%s susurra: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr "%s ahora está Conectado."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s ahora está Desconectado."
@@ -4523,7 +4523,7 @@ msgstr "Portales: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Grupo"
 
@@ -6410,9 +6410,8 @@ msgstr "Tecla de emotes modificadoras"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
-#, fuzzy
 msgid "Pet emote modifier key"
-msgstr "Tecla de emotes modificadoras"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:55
@@ -6450,9 +6449,8 @@ msgstr "Atajo para Emoticono %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "Tecla de emote"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6479,9 +6477,9 @@ msgstr "Tecla de emote"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "Atajo para Emoticono %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7359,9 +7357,8 @@ msgstr "No pudo ser enviado el Susurro, ya que es ignorado por %s."
 
 #. TRANSLATORS: chat message
 #: src/net/ea/chathandler.cpp:129
-#, fuzzy
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "No pudo ser enviado el Susurro, ya que es ignorado por %s."
+msgstr ""
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7428,47 +7425,47 @@ msgstr "Castillo del gremio: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Compartir artículos habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Compartir artículos deshabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "No se puede compartir artículos."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr "Compartir artículos desconocido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Compartir experiencia habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Compartir experiencia deshabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "No se puede compartir experiencia."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr "Compartir experiencia desconocido."
 
@@ -7692,161 +7689,161 @@ msgid "Poison had no effect..."
 msgstr "Veneno no tuvo ningún efecto..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr "Fuerza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr "Agilidad %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalidad %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligencia %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr "Destreza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr "Suerte %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr "Autenticación fallida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr "No hay servidores disponibles."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "Alguien más está tratando de usar esta cuenta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "Ya hay alguien conectado con esta cuenta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr "Speed hack detectado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr "Inicio de sesión duplicada."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr "Error de conexión desconocido."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr "¡Desconectado del servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "Fuerza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "Agilidad"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "Vitalidad"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "Inteligencia"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "Destreza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "Suerte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr "Defensa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr "Ataque M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr "Defensa M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% de Precisión"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr "% de Evasión"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr "% de Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr "Retraso de Ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr "Retraso de Marcha"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr "Rango de Ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr "Daño por segundo."
 
@@ -8318,6 +8315,24 @@ msgstr "pvp activado, gvg activado"
 msgid "unknown pvp"
 msgstr "pvp desconocido"
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "¡%s no está en tu grupo!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "Quién está conectado"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/et.po b/po/et.po
index ad8f7e241..be9842105 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/manaplus/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -481,9 +481,9 @@ msgstr "Abi"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -491,32 +491,32 @@ msgid "Close"
 msgstr "Sulge"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -530,50 +530,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "Viga"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1519,49 +1519,49 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1579,9 +1579,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1590,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,7 +1651,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1659,44 +1659,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1706,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1728,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1736,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1808,85 +1808,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1895,64 +1895,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1962,51 +1962,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2014,144 +2014,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2159,7 +2159,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2167,49 +2167,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2505,11 +2505,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3954,7 +3964,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4783,7 +4793,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr ""
@@ -4854,7 +4864,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr ""
 
@@ -5008,53 +5018,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5064,16 +5078,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5708,7 +5722,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr ""
 
@@ -5723,19 +5737,19 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6060,7 +6074,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6070,17 +6084,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6354,39 +6368,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7155,111 +7208,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7379,43 +7438,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7423,327 +7483,327 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
+#. TRANSLATORS: trade header
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
+msgid "Trade: You and %s"
 msgstr ""
 
-#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
 #, c-format
-msgid "Trade: You and %s"
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: draw backend
@@ -7786,7 +7846,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 84fce8288..041d88532 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/manaplus/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "تایید"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -406,8 +406,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -480,9 +480,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -490,32 +490,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -529,50 +529,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "خطا"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1192,8 +1192,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1467,20 +1467,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1504,7 +1504,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1518,49 +1518,49 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1578,9 +1578,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1589,7 +1589,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1600,7 +1600,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1613,7 +1613,7 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1623,26 +1623,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1650,7 +1650,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1658,44 +1658,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1705,20 +1705,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1727,7 +1727,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1735,69 +1735,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1807,85 +1807,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1894,64 +1894,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1961,51 +1961,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2013,144 +2013,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2158,7 +2158,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2166,49 +2166,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2504,11 +2504,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3953,7 +3963,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4782,7 +4792,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "بساز"
@@ -4853,7 +4863,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr "تغییر گذرواژه"
 
@@ -5007,53 +5017,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "آیا اطمینان دارید که خواهان حذف این شخصیت هستید؟"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "ثبت نام نشده"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5063,16 +5077,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5705,7 +5719,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr ""
 
@@ -5720,19 +5734,19 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6057,7 +6071,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6067,17 +6081,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6351,39 +6365,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7152,111 +7205,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7376,43 +7435,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7420,327 +7480,327 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
+#. TRANSLATORS: trade header
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
+msgid "Trade: You and %s"
 msgstr ""
 
-#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
 #, c-format
-msgid "Trade: You and %s"
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: draw backend
@@ -7783,7 +7843,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index b72f091d2..997b52e56 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 19:09+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
 "language/fi/)\n"
@@ -169,7 +169,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Ryhmän nimi puuttuu."
 
@@ -401,7 +401,7 @@ msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -411,8 +411,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
@@ -486,8 +486,8 @@ msgstr "Apua"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -617,14 +617,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Yleiset"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
@@ -1197,8 +1197,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -1472,20 +1472,20 @@ msgstr "Luo ryhmä"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1509,7 +1509,7 @@ msgstr "Paino: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Tee kaupat"
@@ -1523,49 +1523,49 @@ msgstr "Tee kaupat"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "Hyökkää"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "Kuiskaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "Paranna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "Potki killasta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr "Muuta kilta-asemaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr "Kutsu kiltaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr "Pommita"
 
@@ -1583,9 +1583,9 @@ msgstr "Pommita"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Liiku"
@@ -1594,7 +1594,7 @@ msgstr "Liiku"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Keskustele"
@@ -1605,7 +1605,7 @@ msgstr "Keskustele"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1618,7 +1618,7 @@ msgstr "Osta"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1628,26 +1628,26 @@ msgstr "Myy"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr "Lisää kommentti"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr "Poista hyökkäyslistasta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "Lisää prioriteettihyökkäyslistalle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "Lisää hyökkäyslistaan"
 
@@ -1655,7 +1655,7 @@ msgstr "Lisää hyökkäyslistaan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
@@ -1663,44 +1663,44 @@ msgstr "Lisää ohitettavien listaan"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Lisää nimi keskusteluun"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Pelaajat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "Poimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "Karttaolio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
@@ -1710,20 +1710,20 @@ msgstr "Nimeä uudelleen"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr "Poista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr "Warppaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr ""
 
@@ -1732,7 +1732,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1740,69 +1740,69 @@ msgstr "Asukokonaisuudet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr "Poista asu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Loitsut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr "Muokkaa loitsua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Tyhjennä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "Estä korostus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "Salli korostus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr "Älä poista nimeä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "Poista nimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr "Ota poissaolo käyttöön"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Eroa"
 
@@ -1812,85 +1812,79 @@ msgstr "Eroa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "Kutsu ryhmään"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "Muuta merkin nimeä       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr "Pelaajakommentti          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr "Kommentti:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr "Lisää 10 kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr "Lisää puolet kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
@@ -1899,64 +1893,64 @@ msgstr "Lisää kaikki kauppaan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Varastoi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "Varastoi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "Varastoi puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Ota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
@@ -1966,7 +1960,7 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1976,41 +1970,41 @@ msgid "Use"
 msgstr "Käytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr "Piilota"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "Näytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Kopioi keskusteluun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "Siirrä ylös"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr "Siirrä alas"
 
@@ -2018,144 +2012,150 @@ msgstr "Siirrä alas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr "Riisu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr "Vaimenna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ohita"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr "Musta lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr "Aseta viholliseksi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr "Pyyhi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "Ystävysty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "Seuraa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "Matki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "Osta (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "Myy (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "Kutsu ryhmään"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Pudota..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "Pudota kaikki"
 
@@ -2163,7 +2163,7 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Pudota"
@@ -2171,49 +2171,49 @@ msgstr "Pudota"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Jaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr "Potki"
 
@@ -2515,9 +2515,9 @@ msgid "Lvl: %d"
 msgstr "Taso: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "Mana:"
+msgstr ""
 
 #: src/gui/widgets/skillinfo.cpp:107
 #, c-format
@@ -2547,13 +2547,13 @@ msgid "%s whispers: %s"
 msgstr "%s kuiskaa: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4501,7 +4501,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Ryhmä"
 
@@ -6374,9 +6374,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
-#, fuzzy
 msgid "Pet emote modifier key"
-msgstr "Ota käyttöön / poista pelimuokkaimet"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:55
@@ -6414,9 +6413,8 @@ msgstr "Eleen pikavalinta %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "Eleen pikavalinta %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6443,9 +6441,9 @@ msgstr "Eleen pikavalinta %d"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "Eleen pikavalinta %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7319,9 +7317,8 @@ msgstr "Kuiskausta ei voitu lähettää, %s ei huomioinut sitä."
 
 #. TRANSLATORS: chat message
 #: src/net/ea/chathandler.cpp:129
-#, fuzzy
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Kuiskausta ei voitu lähettää, %s ei huomioinut sitä."
+msgstr ""
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7388,47 +7385,47 @@ msgstr "Killan linna: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Saaliinjako käytössä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Saaliinjako poistettu käytöstä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Saaliinjako ei ole mahdollista."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr "Saaliinjaon tila on tuntematon."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Kokemuksen jako käytössä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Kokemuksen jako pois käytöstä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Kokemuksen jako ei ole mahdollista."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr "Kokemuksen jaon tila on tuntematon."
 
@@ -7648,161 +7645,161 @@ msgid "Poison had no effect..."
 msgstr "Myrkyllä ei ollut vaikutusta..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr "Tunnistus epäonnistui."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr "Palvelimia ei saatavilla."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "Joku muu yrittää käyttää tätä tunnusta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "Tällä tunnuksella on jo kirjauduttu."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr "Nopeusviritelmä havaittu."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr "Kaksinkertainen sisäänkirjautuminen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr "Tuntematon yhteysongelma."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr "Yhteys palvelimeen katkesi!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "Voima"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "Ketteryys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "Elinvoima"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "Älykkyys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "Näppäryys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "Tuuri"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr "Puolustus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr "T.-hyökkäys"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr "T.-puolustus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Tarkkuus"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr "% Välttö"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr "% Täysosuma"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr "Hyökkäysviive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr "Kävelyviive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr "Hyökkäyskantama"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr "Vahinko sekunnissa."
 
@@ -8275,6 +8272,24 @@ msgstr ""
 msgid "unknown pvp"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "%s ei ole ryhmässäsi!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "Kuka on linjoilla"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/fr.po b/po/fr.po
index 5d94a2214..b9a5f84fa 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-09-09 19:10+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 19:10+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
 "fr/)\n"
@@ -179,7 +179,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Le nom du groupe est manquant."
 
@@ -412,7 +412,7 @@ msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr "Tu vois %s"
@@ -422,8 +422,8 @@ msgstr "Tu vois %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
@@ -497,8 +497,8 @@ msgstr "Aide"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -629,14 +629,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Général"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Débogage"
@@ -1210,8 +1210,8 @@ msgstr "Énorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -1485,20 +1485,20 @@ msgstr "Créer un groupe"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1522,7 +1522,7 @@ msgstr "Poids : %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Échange"
@@ -1536,49 +1536,49 @@ msgstr "Échange"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "Attaquer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "Message privé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "Soigner"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "Sortir de la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr "Changer la position dans la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr "Inviter dans la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr "Annihiler"
 
@@ -1596,9 +1596,9 @@ msgstr "Annihiler"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Déplacement"
@@ -1607,7 +1607,7 @@ msgstr "Déplacement"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Parler"
@@ -1618,7 +1618,7 @@ msgstr "Parler"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1631,7 +1631,7 @@ msgstr "Acheter"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1641,26 +1641,26 @@ msgstr "Vendre"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr "Enlever de la liste d'attaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "Ajouter à la liste de priorités d'attaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "Ajouter à la liste d'attaque"
 
@@ -1668,7 +1668,7 @@ msgstr "Ajouter à la liste d'attaque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
@@ -1676,44 +1676,44 @@ msgstr "Ajouter à la liste d'ignorés"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Ajouter le nom dans la conversation"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Joueurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "Sortir du groupe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "Ramasser"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "Objet de carte"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "Renommer"
 
@@ -1723,20 +1723,20 @@ msgstr "Renommer"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr "Enlever"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr "Téléportation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr "Bouger la caméra"
 
@@ -1745,7 +1745,7 @@ msgstr "Bouger la caméra"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1753,69 +1753,69 @@ msgstr "Costumes"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr "Effacer la tenue"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Sortilèges"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr "Éditer le sortilège"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Effacer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "Désactiver la surbrillance"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "Activer la surbrillance"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr "Ne pas enlever les noms"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "Enlève le nom"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr "Active la fonction Absence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Quitter"
 
@@ -1825,85 +1825,79 @@ msgstr "Quitter"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papier"
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "Inviter dans le groupe"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "Changer de position dans la guilde"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr "fenêtre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr "Déverouiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr "Verouiller"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "Nom :                    "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr "Le joueur commente        "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr "Commentaire :                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr "Ajouter pour échanger tout-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
@@ -1912,64 +1906,64 @@ msgstr "Ajouter tout dans l'échange"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Entreposer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "Entreposer 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr "Tout entreposer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "Entreposer tout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Récupérer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr "Tout retirer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
@@ -1979,7 +1973,7 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1989,41 +1983,41 @@ msgid "Use"
 msgstr "Utiliser"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr "Vider la fenêtre de dépôt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr "Cacher"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "Montrer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "Aller vers le haut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -2031,144 +2025,150 @@ msgstr "Aller vers le bas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr "Déshabiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr "Copier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr "Coller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr "Ouvrir lien"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr "Afficher la fenêtre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr "Éviter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr "Liste noire"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr "Définir comme ennemi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr "Éliminer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "Être ami"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "Suivre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "Imiter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "Inviter dans le groupe"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "Montrer les objets"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr "Retirer de la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr "Ajouter à la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr "Objet non protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr "Objet protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Jeter..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "Jeter tout"
 
@@ -2176,7 +2176,7 @@ msgstr "Jeter tout"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Jeter"
@@ -2184,49 +2184,49 @@ msgstr "Jeter"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Partager"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr "MJ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr "Commandes de MJ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr "Vérifier ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr "Aller à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr "Rappeler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Ressusciter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr "Virer"
 
@@ -2528,14 +2528,14 @@ msgid "Lvl: %d"
 msgstr "Niveau : %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "Mana :"
+msgstr ""
 
 #: src/gui/widgets/skillinfo.cpp:107
-#, fuzzy, c-format
+#, c-format
 msgid "Range: %d"
-msgstr "Portée %s"
+msgstr ""
 
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
@@ -2560,13 +2560,13 @@ msgid "%s whispers: %s"
 msgstr "Message privé de %s : %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr "%s est maintenant En Ligne."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s est maintenant Hors Ligne."
@@ -4532,7 +4532,7 @@ msgstr "Portails : %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Groupe"
 
@@ -6416,9 +6416,8 @@ msgstr "Touche du modificateur d'émoticône"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
-#, fuzzy
 msgid "Pet emote modifier key"
-msgstr "Touche du modificateur d'émoticône"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:55
@@ -6456,9 +6455,8 @@ msgstr "Raccourci d'émoticône %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "Raccourcis des émoticônes"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6485,9 +6483,9 @@ msgstr "Raccourcis des émoticônes"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "Raccourci d'émoticône %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7369,9 +7367,8 @@ msgstr "Le message privé n'a pu être envoyé, tu es ignoré par %s."
 
 #. TRANSLATORS: chat message
 #: src/net/ea/chathandler.cpp:129
-#, fuzzy
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Le message privé n'a pu être envoyé, tu es ignoré par %s."
+msgstr ""
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7438,47 +7435,47 @@ msgstr "Château de la guilde : %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Partage d'objet activé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Partage d'objet désactivé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Partage d'objet impossible."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr "Paramètre de partage d'objets inconnu."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Partage d'expérience autorisé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Partage d'expérience non autorisé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr "Paramètre de partage d'expérience inconnu."
 
@@ -7703,161 +7700,161 @@ msgid "Poison had no effect..."
 msgstr "Le poison n'a pas eu d'effet..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr "Force %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr "Agilité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr "Intelligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr "Dextérité %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr "Chance %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr "Échec de l'authentification."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr "Aucun serveur n'est disponible."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "Quelqu'un d'autre essaie d'utiliser ce compte."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "Ce compte est déjà connecté."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr "Speed hack détecté."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr "Authentification déjà effectuée."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr "Erreur de connexion inconnue."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr "Vous avez été déconnecté du serveur !"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "Force"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "Agilité"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "Vitalité"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "Dextérité"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "Chance"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr "Défense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr "Attaque M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr "Défense M."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Précision"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr "% Esquive"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr "% Coup critique"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr "Temps de l'attaque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr "Temps de déplacement"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr "Portée de l'attaque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr "Dégâts par s."
 
@@ -8330,6 +8327,24 @@ msgstr "pvp on, gvg on"
 msgid "unknown pvp"
 msgstr "pvp inconnu"
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "%s n'est pas membre de ton groupe !"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "Qui est en ligne"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/he.po b/po/he.po
index 054785253..26ac5c085 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/manaplus/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "אישור"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -481,9 +481,9 @@ msgstr "עזרה"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -491,32 +491,32 @@ msgid "Close"
 msgstr "סגור"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -530,50 +530,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "שגיאה"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "סחרר"
@@ -1519,49 +1519,49 @@ msgstr "סחרר"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr "תקוף"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1579,9 +1579,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1590,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "דבר"
@@ -1601,7 +1601,7 @@ msgstr "דבר"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr "קנה"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr "מכר"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,7 +1651,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1659,44 +1659,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "שחקנים"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1706,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1728,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1736,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1808,85 +1808,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1895,64 +1895,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "אחסן"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "החזר"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1962,51 +1962,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "השתמש"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2014,144 +2014,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2159,7 +2159,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "השלך"
@@ -2167,49 +2167,49 @@ msgstr "השלך"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "פצל"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2505,11 +2505,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3954,7 +3964,7 @@ msgstr "אפשר לחישות"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4783,7 +4793,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "צור"
@@ -4854,7 +4864,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr "שנה סיסמה"
 
@@ -5008,53 +5018,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "שחק"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr "מידע"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "בטל רישום"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5064,16 +5078,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5708,7 +5722,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr "בקשה למסחר"
 
@@ -5723,19 +5737,19 @@ msgid "Up"
 msgstr "למעלה"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6060,7 +6074,7 @@ msgid "Completed"
 msgstr "הסתיים"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6070,17 +6084,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6354,39 +6368,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "קיצור־דרך לריגשון %d"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7155,111 +7208,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7379,43 +7438,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7423,329 +7483,329 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr "נותקת מהשרת!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr "עוצמה"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr "זריזות"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr "חיוניות"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr "תבונה"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr "מיומנות"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr "מזל"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s מעוניין לסחור עימך, האם אתה מסכים?"
-
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s מעוניין לסחור עימך, האם אתה מסכים?"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7786,7 +7846,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "ללא שם"
diff --git a/po/hr.po b/po/hr.po
index 93f3424ec..9d3d12cb0 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/manaplus/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "U redu"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -408,8 +408,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -482,9 +482,9 @@ msgstr "Pomoć"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -492,32 +492,32 @@ msgid "Close"
 msgstr "Zatvori"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -531,50 +531,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "Greška"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1194,8 +1194,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1469,20 +1469,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1506,7 +1506,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Trgovanje"
@@ -1520,49 +1520,49 @@ msgstr "Trgovanje"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr "Napad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1580,9 +1580,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1591,7 +1591,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Govori"
@@ -1602,7 +1602,7 @@ msgstr "Govori"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1615,7 +1615,7 @@ msgstr "Kupi"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1625,26 +1625,26 @@ msgstr "Prodaj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1652,7 +1652,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1660,44 +1660,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Igrači"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1707,20 +1707,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1729,7 +1729,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1737,69 +1737,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1809,85 +1809,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1896,64 +1896,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Pohrani"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Preuzmi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1963,51 +1963,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Upotrijebi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2015,144 +2015,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2160,7 +2160,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Ispusti"
@@ -2168,49 +2168,49 @@ msgstr "Ispusti"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Razdvoji"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2506,11 +2506,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3955,7 +3965,7 @@ msgstr "Dozvoli šapate"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4784,7 +4794,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "Stvori"
@@ -4855,7 +4865,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr "Promijeni Lozinku"
 
@@ -5009,53 +5019,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Igraj"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Odjavi"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5065,16 +5079,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5711,7 +5725,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr "Zahtjev za Trgovanje"
 
@@ -5726,19 +5740,19 @@ msgid "Up"
 msgstr "Gore"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6063,7 +6077,7 @@ msgid "Completed"
 msgstr "Dovršeno"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6073,17 +6087,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6357,39 +6371,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Prečica za Ispoljavanje emocija %d"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7158,111 +7211,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7382,43 +7441,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7426,329 +7486,329 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr "Snaga"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr "Okretnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr "Vitalnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr "Inteligencija"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr "Spretnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr "Sreća"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s želi trgovati s vama, prihvaćate li?"
-
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s želi trgovati s vama, prihvaćate li?"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7789,7 +7849,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "neimenovano"
diff --git a/po/hu.po b/po/hu.po
index c36d26e73..fe5e47aab 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/manaplus/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -481,9 +481,9 @@ msgstr "Súgó"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -491,32 +491,32 @@ msgid "Close"
 msgstr "Bezár"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -530,50 +530,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "Hiba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Üzlet"
@@ -1519,49 +1519,49 @@ msgstr "Üzlet"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr "Támadás"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1579,9 +1579,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1590,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Csevegés"
@@ -1601,7 +1601,7 @@ msgstr "Csevegés"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr "Vétel"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr "Eladás"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,7 +1651,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1659,44 +1659,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Játékosok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1706,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1728,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1736,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1808,85 +1808,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1895,64 +1895,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Raktároz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Magához vesz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1962,51 +1962,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Bevet"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2014,144 +2014,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2159,7 +2159,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Eldob"
@@ -2167,49 +2167,49 @@ msgstr "Eldob"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Felosztás"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2505,11 +2505,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3954,7 +3964,7 @@ msgstr "Privát engedélyezése"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4783,7 +4793,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "Létrehozás"
@@ -4854,7 +4864,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr "Jelszó módosítása"
 
@@ -5008,53 +5018,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Biztos hogy ki akarod törölni ezt a karaktert?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Játék"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr "Infó"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Regisztráció megszüntetése"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5064,16 +5078,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5708,7 +5722,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr "Üzleti ajánlat"
 
@@ -5723,19 +5737,19 @@ msgid "Up"
 msgstr "Fejleszt"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6060,7 +6074,7 @@ msgid "Completed"
 msgstr "Kész"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6070,17 +6084,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6354,39 +6368,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Hangulatjel Gyorsmenü %d"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7155,111 +7208,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7379,43 +7438,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7423,329 +7483,329 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr "Lekapcsolódtál a szerverről!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr "Erő"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr "Mozgékonyság"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr "Egészség"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr "Intelligencia"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr "Ügyesség"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr "Szerencse"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s üzletelni akar veled. Te akarsz vele?"
-
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s üzletelni akar veled. Te akarsz vele?"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7786,7 +7846,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Névtelen"
diff --git a/po/id.po b/po/id.po
index 804af4e95..ba9e7a1fa 100644
--- a/po/id.po
+++ b/po/id.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
 "language/id/)\n"
@@ -172,7 +172,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Nama kelompok tidak dapat di temukan."
 
@@ -403,7 +403,7 @@ msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -413,8 +413,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr ""
 
@@ -488,8 +488,8 @@ msgstr "Bantuan"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -619,14 +619,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Umum"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
@@ -1199,8 +1199,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(kembalikan)"
 
@@ -1474,20 +1474,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1511,7 +1511,7 @@ msgstr "Berat: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Tukar"
@@ -1525,49 +1525,49 @@ msgstr "Tukar"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "Pukul"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "Berbisik"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "Menyembuhkan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "Keluarkan dari organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr "Ubah posisi di organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr "Undang ke organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr "Sembunyikan"
 
@@ -1585,9 +1585,9 @@ msgstr "Sembunyikan"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Jalan"
@@ -1596,7 +1596,7 @@ msgstr "Jalan"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Berbicara"
@@ -1607,7 +1607,7 @@ msgstr "Berbicara"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1620,7 +1620,7 @@ msgstr "Beli"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1630,26 +1630,26 @@ msgstr "Jual"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr "Penambahan komentar"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr "Hapus dari daftar menyerang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "Tambahkan prioritas daftar menyerang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "Tambahkan ke daftar menyerang"
 
@@ -1657,7 +1657,7 @@ msgstr "Tambahkan ke daftar menyerang"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "Tambahkan ke daftar Abaikan"
 
@@ -1665,44 +1665,44 @@ msgstr "Tambahkan ke daftar Abaikan"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Tambahkan nama ke Obrolan"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Pemain"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "Ambil"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "Ambil ke obrolan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "Daftar barang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "Ganti nama"
 
@@ -1712,20 +1712,20 @@ msgstr "Ganti nama"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr ""
 
@@ -1734,7 +1734,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1742,69 +1742,69 @@ msgstr "Setelan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Mantra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr "Edit mantra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "Nonaktifkan sorotan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "Aktifkan sorotan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "hapus nama"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1814,85 +1814,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "Undang ke kelompok"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "Ubah posisi Organisasi"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "Ubah nama tanda peta     "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "Nama:                    "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr "Komentar pemain           "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr "komentar                      "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr "Tambahkan semua ke Penukaran"
 
@@ -1901,64 +1895,64 @@ msgstr "Tambahkan semua ke Penukaran"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Simpan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "Masukkan 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "Masukkan setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "Masukkan semua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Kembalikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
@@ -1968,7 +1962,7 @@ msgstr "Ambil semua"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1978,41 +1972,41 @@ msgid "Use"
 msgstr "Gunakan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr "Sembunyikan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "Tampilkan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Pindahkan ke chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "Bergerak keatas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
@@ -2020,144 +2014,150 @@ msgstr "Bergerak kebawah"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr "Tanggalkan pakaian"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "Jadikan teman"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "Batalkan pengabaian"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "Mengikuti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "Tirukan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "Undang ke kelompok"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "Perlihatkan item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Buang..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "Buang semuanya"
 
@@ -2165,7 +2165,7 @@ msgstr "Buang semuanya"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Buang"
@@ -2173,49 +2173,49 @@ msgstr "Buang"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Pecah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr "keluarkan"
 
@@ -2517,9 +2517,9 @@ msgid "Lvl: %d"
 msgstr "Level: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "Mana:"
+msgstr ""
 
 #: src/gui/widgets/skillinfo.cpp:107
 #, c-format
@@ -2549,13 +2549,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4500,7 +4500,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Kelompok"
 
@@ -7381,47 +7381,47 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -7640,161 +7640,161 @@ msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr ""
 
@@ -8266,6 +8266,23 @@ msgstr ""
 msgid "unknown pvp"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, c-format
+msgid "Char from account %s is already in your party!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+msgid "Char is not online!"
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/it.po b/po/it.po
index 5f5c18b7d..4f032a369 100644
--- a/po/it.po
+++ b/po/it.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 19:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
 "language/it/)\n"
@@ -177,7 +177,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Manca il nome del party."
 
@@ -409,7 +409,7 @@ msgid "Imitation canceled"
 msgstr "Modalità Imitazione cancellata"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -419,8 +419,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "Ignora completamente."
 
@@ -494,8 +494,8 @@ msgstr "Aiuto"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -625,14 +625,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Generale"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
@@ -1205,8 +1205,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(default)"
 
@@ -1480,20 +1480,20 @@ msgstr "Crea gruppo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1517,7 +1517,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Commercia"
@@ -1531,49 +1531,49 @@ msgstr "Commercia"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "Attacco"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "Sussurra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "Cura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "Caccia dalla gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr "Cambia ruolo nella gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr "Invita nell gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr "Nascondi"
 
@@ -1591,9 +1591,9 @@ msgstr "Nascondi"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Movimento"
@@ -1602,7 +1602,7 @@ msgstr "Movimento"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Parla"
@@ -1613,7 +1613,7 @@ msgstr "Parla"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1626,7 +1626,7 @@ msgstr "Compra"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1636,26 +1636,26 @@ msgstr "Vendi"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr "Aggiungi commento"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr "Rimuovi dalla lista Attacco"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "Aggiungi alla lista Attacco - Priorità"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "Aggiungi alla lista Attacco"
 
@@ -1663,7 +1663,7 @@ msgstr "Aggiungi alla lista Attacco"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "Aggiungi alla lista Ignora"
 
@@ -1671,44 +1671,44 @@ msgstr "Aggiungi alla lista Ignora"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Aggiungi nome alla chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Giocatori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "Caccia dal party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "Raccogli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "Oggetto mappa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "Rinomina"
 
@@ -1718,20 +1718,20 @@ msgstr "Rinomina"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr "Teletrasporto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr "Muovi telecamera"
 
@@ -1740,7 +1740,7 @@ msgstr "Muovi telecamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1748,69 +1748,69 @@ msgstr "Attrezzatura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr "Modifica Incantesimo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Cancella"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "Disabilita highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "Abilita highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr "Non rimuovere il nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "Rimuovi nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr "Abilita modalita' Away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr "Disabilita modalita' Away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Lascia"
 
@@ -1820,85 +1820,79 @@ msgstr "Lascia"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr "Copia negli appunti"
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "Invita nel party"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "Rinomina mappa           "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr "Commento giocatore:       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr "Commento:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr "Aggiungi allo scambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr "Aggiungi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr "Aggiungi metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr "Aggiungi tutti"
 
@@ -1907,64 +1901,64 @@ msgstr "Aggiungi tutti"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Magazzino"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "Salva 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "Salva metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "Salva tutto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Recupera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
@@ -1974,7 +1968,7 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1984,41 +1978,41 @@ msgid "Use"
 msgstr "Usa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr "Nascondi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "Mostra"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr "Reset barra gialla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Copia in Chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "Muovi Su"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr "Muovi Giù"
 
@@ -2026,144 +2020,150 @@ msgstr "Muovi Giù"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr "Spogliati"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr "Copia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr "Incolla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr "Apri link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr "Mostra Finestra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr "Lista nera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr "Identifica come nemico"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr "Elimina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "Chiedi amicizia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "Stop Ignora"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "Segui"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "Imita"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "Compra (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "Vendi (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "Invita nel party"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "Mostra Oggetti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr "Rimuovi dalla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr "Aggiungi alla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Lascia..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "Lascia tutto"
 
@@ -2171,7 +2171,7 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Lascia"
@@ -2179,49 +2179,49 @@ msgstr "Lascia"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Dividi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr "Caccia"
 
@@ -2523,9 +2523,9 @@ msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "Mana:"
+msgstr ""
 
 #: src/gui/widgets/skillinfo.cpp:107
 #, c-format
@@ -2555,13 +2555,13 @@ msgid "%s whispers: %s"
 msgstr "%s sussurra: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4514,7 +4514,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Party"
 
@@ -6428,9 +6428,8 @@ msgstr "Scorciatoia Emote %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "Scorciatoia Emote %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6457,9 +6456,9 @@ msgstr "Scorciatoia Emote %d"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "Scorciatoia Emote %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7335,9 +7334,8 @@ msgstr "Il messaggio privato e' stato ignorato da %s."
 
 #. TRANSLATORS: chat message
 #: src/net/ea/chathandler.cpp:129
-#, fuzzy
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Il messaggio privato e' stato ignorato da %s."
+msgstr ""
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7404,47 +7402,47 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Gestione in comune oggetti attivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Gestione in comune oggetti disattivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Gestione in comune oggetti non puo' essere attivata."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr "Oggetti in comune sconosciuti."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Esperienza in comune attivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Esperienza in comune disattivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Esperienza in comune non puo' essere attivata."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr "Esperienza in comune sconosciuta."
 
@@ -7668,161 +7666,161 @@ msgid "Poison had no effect..."
 msgstr "Il veleno non ha effetto..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr "Nessun server disponibile."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "Qualcun altro sta provando ad usare questo account."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "Questo account è già registrato."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr "Rilevato speed hack."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr "Accesso duplicato."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr "Errore di connessione sconosciuto."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr "Disconnesso dal server!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "Forza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "Agilità"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "Vitalità"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "Intelligenza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "Destrezza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "Fortuna"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr "Difesa."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr "Attacco magico."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr "Difesa Magica."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuratezza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasione"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr "% Colpo critico"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr "Ritardo Attacco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr "Ritardo Movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr "Range d'attacco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr "Danno per secondo."
 
@@ -8294,6 +8292,24 @@ msgstr ""
 msgid "unknown pvp"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "%s non è nel tuo party!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "Chi è online"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index 5969447b0..4c0e8d235 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 19:10+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
 "language/ja/)\n"
@@ -174,7 +174,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "パーティ名がありません."
 
@@ -405,7 +405,7 @@ msgid "Imitation canceled"
 msgstr "真似をやめる"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -415,8 +415,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -490,8 +490,8 @@ msgstr "ヘルプ"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -621,14 +621,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "デバッグ"
@@ -1201,8 +1201,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1476,20 +1476,20 @@ msgstr "パーティを作る"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1513,7 +1513,7 @@ msgstr "重力: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "トレード"
@@ -1527,49 +1527,49 @@ msgstr "トレード"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "攻撃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "ささやく"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "HP回復"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "ギルドから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr "ギルドでの役割を変更"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr "ギルドへ招待"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr "消す"
 
@@ -1587,9 +1587,9 @@ msgstr "消す"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "動く"
@@ -1598,7 +1598,7 @@ msgstr "動く"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "話す"
@@ -1609,7 +1609,7 @@ msgstr "話す"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1622,7 +1622,7 @@ msgstr "買う"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1632,26 +1632,26 @@ msgstr "売る"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr "コメントをする"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr "攻撃リストから削除する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "攻撃優先リストへ追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "攻撃リストへ追加する"
 
@@ -1659,7 +1659,7 @@ msgstr "攻撃リストへ追加する"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "攻撃無視リストへ追加する"
 
@@ -1667,44 +1667,44 @@ msgstr "攻撃無視リストへ追加する"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "名前をチャットへ追加する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "プレイヤー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "パーティから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "拾う"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "チャットに追加"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "マップアイテム"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "名前を変更する"
 
@@ -1714,20 +1714,20 @@ msgstr "名前を変更する"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr "削除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr "ワープ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr "カメラを動かす"
 
@@ -1736,7 +1736,7 @@ msgstr "カメラを動かす"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1744,69 +1744,69 @@ msgstr "服装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr "服装を削除する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "呪文"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr "呪文を編集する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "クリア"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr "名前を消さない"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "名前を削除する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr "AFKを有効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr "AFKを無効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "退会"
 
@@ -1816,85 +1816,79 @@ msgstr "退会"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "パーティへ招待"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "マップサインの名前を変更 "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "名前:                    "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr "プレイヤーコメント        "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr "コメント:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr "トレードウィンドウに追加"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr "トレードウィンドウに10追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr "トレードウィンドウに半分追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr "トレードウィンドウに全て追加する"
 
@@ -1903,64 +1897,64 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "保管"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "10 保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "半分保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "全部保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "10 取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "半分取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "全部取出す"
 
@@ -1970,7 +1964,7 @@ msgstr "全部取出す"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1980,41 +1974,41 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr "ドロップ窓を消す"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr " 非表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "上へ移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr "下へ移動"
 
@@ -2022,144 +2016,150 @@ msgstr "下へ移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr "脱ぐ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr "コピー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr "ペースト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr "無視する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr "ブラックリスト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr "敵に設定する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr "消す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "友達になる"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "完全無視解除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "フォロー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "真似"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "買う (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "売る (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "パーティへ招待"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "アイテムを表示する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "落とす..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "全て落とす"
 
@@ -2167,7 +2167,7 @@ msgstr "全て落とす"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "落とす"
@@ -2175,49 +2175,49 @@ msgstr "落とす"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "分割"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr "追い出す"
 
@@ -2519,9 +2519,9 @@ msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "マナ:"
+msgstr ""
 
 #: src/gui/widgets/skillinfo.cpp:107
 #, c-format
@@ -2551,13 +2551,13 @@ msgid "%s whispers: %s"
 msgstr "%s ささやく: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4504,7 +4504,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "パーティー"
 
@@ -6377,9 +6377,8 @@ msgstr "スマイリー編集キー"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
-#, fuzzy
 msgid "Pet emote modifier key"
-msgstr "スマイリー編集キー"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:55
@@ -6417,9 +6416,8 @@ msgstr "スマイリーショートカット: %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "スマイリーショートカット"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6446,9 +6444,9 @@ msgstr "スマイリーショートカット"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "スマイリーショートカット: %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7326,9 +7324,8 @@ msgstr "%sが完全無視設定をしている為ささやきは送れません�
 
 #. TRANSLATORS: chat message
 #: src/net/ea/chathandler.cpp:129
-#, fuzzy
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "%sが完全無視設定をしている為ささやきは送れませんでした."
+msgstr ""
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7395,47 +7392,47 @@ msgstr "ギルド城: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "アイテム共有モード有効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "アイテム共有モード無効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "アイテム共有モード不可能."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr "アイテム共有モード不明."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Expシェアモード有効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Expシェアモード無効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Expシェアモード不可能."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr "Expシェアモード不明."
 
@@ -7654,161 +7651,161 @@ msgid "Poison had no effect..."
 msgstr "毒の影響はなかった..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr "認証に失敗しました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr "利用できるサーバーがありません."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "他からのログインがありました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "このアカウントは既にログイン中です."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr "スピードハックが探知されました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr "重複ログイン."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr "不明な接続エラーです."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr "サーバーから切断されました!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "攻撃力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "機敏さ"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "防御力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "魔力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "命中率"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "幸運"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr "Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr "M.Attack"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr "M.Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr "攻撃遅延"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr " 徒歩遅延"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr "攻撃距離"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr "ダメージ/秒."
 
@@ -8280,6 +8277,24 @@ msgstr ""
 msgid "unknown pvp"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "%sはパーティのメンバーではありません!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "オンラインリスト"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/ka.po b/po/ka.po
index caa23dbb6..ea259460a 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/manaplus/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -406,8 +406,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -480,9 +480,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -490,32 +490,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -529,50 +529,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1192,8 +1192,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1467,20 +1467,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1504,7 +1504,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1518,49 +1518,49 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1578,9 +1578,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1589,7 +1589,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1600,7 +1600,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1613,7 +1613,7 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1623,26 +1623,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1650,7 +1650,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1658,44 +1658,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1705,20 +1705,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1727,7 +1727,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1735,69 +1735,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1807,85 +1807,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1894,64 +1894,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1961,51 +1961,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2013,144 +2013,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2158,7 +2158,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2166,49 +2166,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2504,11 +2504,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3953,7 +3963,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4782,7 +4792,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr ""
@@ -4853,7 +4863,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr ""
 
@@ -5007,53 +5017,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5063,16 +5077,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5705,7 +5719,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr ""
 
@@ -5720,19 +5734,19 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6057,7 +6071,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6067,17 +6081,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6351,39 +6365,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7152,111 +7205,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7376,43 +7435,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7420,327 +7480,327 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
+#. TRANSLATORS: trade header
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
+msgid "Trade: You and %s"
 msgstr ""
 
-#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
 #, c-format
-msgid "Trade: You and %s"
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: draw backend
@@ -7783,7 +7843,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
diff --git a/po/manaplus.pot b/po/manaplus.pot
index bd22beb39..b2043709b 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: 2014-09-09 20:33+0300\n"
+"POT-Creation-Date: 2014-09-10 21:55+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"
@@ -165,7 +165,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr ""
 
@@ -397,7 +397,7 @@ msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr ""
 
@@ -482,8 +482,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -613,14 +613,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr ""
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1519,49 +1519,49 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr ""
 
@@ -1579,9 +1579,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1590,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,7 +1651,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1659,44 +1659,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1706,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1728,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1736,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1808,85 +1808,79 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr ""
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr ""
 
@@ -1895,64 +1889,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr ""
 
@@ -1962,7 +1956,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1972,41 +1966,41 @@ msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr ""
 
@@ -2014,144 +2008,150 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr ""
 
@@ -2159,7 +2159,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2167,49 +2167,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr ""
 
@@ -2543,13 +2543,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4494,7 +4494,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr ""
 
@@ -7377,47 +7377,47 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -7634,161 +7634,161 @@ msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr ""
 
@@ -8260,6 +8260,23 @@ msgstr ""
 msgid "unknown pvp"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, c-format
+msgid "Char from account %s is already in your party!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+msgid "Char is not online!"
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/nb.po b/po/nb.po
index 31121c18b..46c7929cf 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/manaplus/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -481,9 +481,9 @@ msgstr "Hjelp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -491,32 +491,32 @@ msgid "Close"
 msgstr "Lukk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -530,50 +530,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "Feil"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1519,49 +1519,49 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1579,9 +1579,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1590,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr "Kjøp"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr "Selg"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,7 +1651,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1659,44 +1659,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spillere"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1706,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1728,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1736,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1808,85 +1808,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1895,64 +1895,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1962,51 +1962,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Bruk"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2014,144 +2014,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2159,7 +2159,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2167,49 +2167,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Del opp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2505,11 +2505,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3954,7 +3964,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4783,7 +4793,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "Lag"
@@ -4854,7 +4864,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr "Endre passord"
 
@@ -5008,53 +5018,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne karakteren?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Avregistrer"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5064,16 +5078,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5708,7 +5722,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr ""
 
@@ -5723,19 +5737,19 @@ msgid "Up"
 msgstr "Opp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6060,7 +6074,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6070,17 +6084,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6354,39 +6368,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7155,111 +7208,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7379,43 +7438,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7423,327 +7483,327 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
+#. TRANSLATORS: trade header
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
+msgid "Trade: You and %s"
 msgstr ""
 
-#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
 #, c-format
-msgid "Trade: You and %s"
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: draw backend
@@ -7786,7 +7846,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 68d4a02da..c79e0405c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 19:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -46,110 +46,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d weken"
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d dagen"
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d uren"
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d minuten"
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d seconden"
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -303,12 +303,12 @@ msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
@@ -410,8 +410,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -484,9 +484,9 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -494,32 +494,32 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -533,50 +533,50 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
@@ -1196,8 +1196,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1471,20 +1471,20 @@ msgstr "Groep aanmaken"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1508,7 +1508,7 @@ msgstr "Gewicht: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Handel"
@@ -1522,49 +1522,49 @@ msgstr "Handel"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr "Aanvallen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr "Fluister"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr "Genees"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr "Uit de gilde gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr "De positie binnen de gilde veranderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr "Uitnodigen voor de gilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1582,9 +1582,9 @@ msgstr "Nuke"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Beweeg"
@@ -1593,7 +1593,7 @@ msgstr "Beweeg"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Spreken"
@@ -1604,7 +1604,7 @@ msgstr "Spreken"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1617,7 +1617,7 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1627,26 +1627,26 @@ msgstr "Verkopen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr "Van de aanvalslijst verwijderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr "Aan de prioriteitsaanvalslijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr "Aan de aanvalslijst toevoegen"
 
@@ -1654,7 +1654,7 @@ msgstr "Aan de aanvalslijst toevoegen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
@@ -1662,44 +1662,44 @@ msgstr "an de negeerlijst toevoegen"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr "Naam aan het gesprek toevoegen"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -1709,20 +1709,20 @@ msgstr "Hernoem"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr "Verwijder"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1731,7 +1731,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1739,69 +1739,69 @@ msgstr "Kleren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Spreuken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr "Wijzig spreuk"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Wissen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr "Verwijder naam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr "away aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr "away afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -1811,85 +1811,85 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen   "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr "Naam:                    "
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1898,64 +1898,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Opslaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr "Plaats 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr "Plaats de helft"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -1965,51 +1965,51 @@ msgstr "Haal alles op"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2017,144 +2017,144 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Negeer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr "Imiteer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2162,7 +2162,7 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Neerleggen"
@@ -2170,49 +2170,49 @@ msgstr "Neerleggen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Splitsen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr "Schop"
 
@@ -2508,11 +2508,21 @@ msgid "Edit"
 msgstr "Wijzig"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3957,7 +3967,7 @@ msgstr "Fluisteren toestaan"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4786,7 +4796,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "Aanmaken"
@@ -4857,7 +4867,7 @@ msgstr "De email adres ingaven zijn niet gelijk."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr "Wijzig wachtwoord"
 
@@ -5011,53 +5021,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr "Verwissel Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Spelen"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Registreren"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr "Wijzig Email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5067,16 +5081,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr "Ongeldig paswoord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
@@ -5711,7 +5725,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
@@ -5726,19 +5740,19 @@ msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
@@ -6063,7 +6077,7 @@ msgid "Completed"
 msgstr "Voltooid"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Wie Is Online - Bijwerken"
 
@@ -6073,17 +6087,17 @@ msgid "Update"
 msgstr "Bijwerken"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Wie Is Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
@@ -6357,39 +6371,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emoticon snelkoppeling %d"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7158,111 +7211,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Sterkte:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Agiliteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Vitaliteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Intelligentie:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Dexteriteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Geluk:"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr "Onbekende char-server fout."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr "Verkeerde naam."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr "Ongeldige statistieken."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr "Ongeldig haar."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr "Personage verwijderd."
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr "Spel"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr "Aanvraag op de stoppen is geweigerd!"
 
@@ -7382,43 +7441,44 @@ msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr "Verkeerd wachtwoord."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr "Geweigered door de server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr "Client is te oud."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7426,329 +7486,329 @@ msgid ""
 msgstr "Je bent tijdelijk geband van het spel tot %s.\nNeem aub contact op met het GM team via de forums."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr "Deze gebruikersnaam is al genomen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr "Gebruikersnaam is compleet verwijderd."
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr "Leeg adres gegeven aan Network::connect()!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr "Niet mogelijk te resolven van host \""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr "Verbinding met server beëindigd. "
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr "Bericht"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven herstellen."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr "Handel mislukte!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr "Emoticon gefaald!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr "Zitten niet mogelijk!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr "Chatcreatie mislukte!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr "Kan je niet bij de groep voegen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr "Kan niet roepen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Je hebt nog geen hoog genoeg level bereikt!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr "Onvoldoende leven!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr "Onvoldoende Vaardigheidspunten!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr "Je hebt geen memo's!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr "Je kan dat nu niet doen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "Je hebt een andere rode edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr "Je hebt een andere blauwe edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr "Huh? Wat is dat?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr "Warp mislukt..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr "Kon niets stelen..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr "Gif had geen effect..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr "Authenticatie gefaald."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr "Geen servers beschikbaar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr "Iemand anders is aan het proberen deze account te gebruiken."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr "Deze account is al ingelogd."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr "Snelheidshack gedetecteerd."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr "Verdubbelde login."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr "Onbekende connectiefout."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr "Kracht"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr "Behendigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr "Vitaliteit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr "Intelligentie"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr "Handigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr "Geluk"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr "Verdediging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr "M.Aanval"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr "M.Verdediging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Nauwkeurigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr "% Ontwijking"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr "Aanvalsvertraging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr "Wandelvertraging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr "Aanvalsbereik"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s wil met jou handelen, aanvaard je dit?"
-
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Handelen: Jij en %s"
 
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s wil met jou handelen, aanvaard je dit?"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7789,7 +7849,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "naamloos"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index b5a76ffb0..b5329d32a 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 19:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
 "language/nl_BE/)\n"
@@ -171,7 +171,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
@@ -403,7 +403,7 @@ msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -413,8 +413,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -488,8 +488,8 @@ msgstr "Help"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -619,14 +619,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
@@ -1199,8 +1199,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1474,20 +1474,20 @@ msgstr "Groep aanmaken"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1511,7 +1511,7 @@ msgstr "Gewicht: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Handel"
@@ -1525,49 +1525,49 @@ msgstr "Handel"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "Aanvallen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "Fluister"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "Genees"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "Uit de gilde gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr "De positie binnen de gilde veranderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr "Uitnodigen voor de gilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1585,9 +1585,9 @@ msgstr "Nuke"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Beweeg"
@@ -1596,7 +1596,7 @@ msgstr "Beweeg"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Spreken"
@@ -1607,7 +1607,7 @@ msgstr "Spreken"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1620,7 +1620,7 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1630,26 +1630,26 @@ msgstr "Verkopen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr "Van de aanvalslijst verwijderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "Aan de prioriteitsaanvalslijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "Aan de aanvalslijst toevoegen"
 
@@ -1657,7 +1657,7 @@ msgstr "Aan de aanvalslijst toevoegen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
@@ -1665,44 +1665,44 @@ msgstr "an de negeerlijst toevoegen"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Naam aan het gesprek toevoegen"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -1712,20 +1712,20 @@ msgstr "Hernoem"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr "Verwijder"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr ""
 
@@ -1734,7 +1734,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1742,69 +1742,69 @@ msgstr "Kleren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Spreuken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr "Wijzig spreuk"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Wissen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "Verwijder naam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr "away aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr "away afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -1814,85 +1814,79 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "uitnodigen voor de groep"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen   "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "Naam:                    "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr ""
 
@@ -1901,64 +1895,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Opslaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "Plaats 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "Plaats de helft"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -1968,7 +1962,7 @@ msgstr "Haal alles op"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1978,41 +1972,41 @@ msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2020,144 +2014,150 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Negeer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "Imiteer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "uitnodigen voor de groep"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2165,7 +2165,7 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Neerleggen"
@@ -2173,49 +2173,49 @@ msgstr "Neerleggen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Splitsen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr "Schop"
 
@@ -2517,9 +2517,9 @@ msgid "Lvl: %d"
 msgstr "Niv: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "Mana:"
+msgstr ""
 
 #: src/gui/widgets/skillinfo.cpp:107
 #, c-format
@@ -2549,13 +2549,13 @@ msgid "%s whispers: %s"
 msgstr "%s fluistert: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4506,7 +4506,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Groep"
 
@@ -6420,9 +6420,8 @@ msgstr "Emoticon snelkoppeling %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "Emoticon snelkoppeling %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6449,9 +6448,9 @@ msgstr "Emoticon snelkoppeling %d"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "Emoticon snelkoppeling %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7394,47 +7393,47 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Voorwerpdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr "Voorwerpdeling onbekend."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Ervaringsdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Ervaringsdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Ervaringsdeling is niet mogelijk."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -7655,161 +7654,161 @@ msgid "Poison had no effect..."
 msgstr "Gif had geen effect..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr "Authenticatie gefaald."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr "Geen servers beschikbaar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "Iemand anders is aan het proberen deze account te gebruiken."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "Deze account is al ingelogd."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr "Snelheidshack gedetecteerd."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr "Verdubbelde login."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr "Onbekende connectiefout."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "Kracht"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "Behendigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "Vitaliteit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "Intelligentie"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "Handigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "Geluk"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr "Verdediging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr "M.Aanval"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr "M.Verdediging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Nauwkeurigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr "% Ontwijking"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr "Aanvalsvertraging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr "Wandelvertraging"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr "Aanvalsbereik"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr ""
 
@@ -8282,6 +8281,24 @@ msgstr "pvp aan, gvg aan"
 msgid "unknown pvp"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "%s is niet in jouw groep!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "Wie is online"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index 2d6fb1166..2457e11d9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 19:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
 "pl/)\n"
@@ -174,7 +174,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Brakuje nazwy grupy."
 
@@ -407,7 +407,7 @@ msgid "Imitation canceled"
 msgstr "Imitacja anulowana"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr "Widzisz %s"
@@ -417,8 +417,8 @@ msgstr "Widzisz %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "Całkowicie ignoruj"
 
@@ -492,8 +492,8 @@ msgstr "Pomoc"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -623,14 +623,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Ogólny"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
@@ -1203,8 +1203,8 @@ msgstr "Ogromna (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(domyślne)"
 
@@ -1478,20 +1478,20 @@ msgstr "Utwórz grupę"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1515,7 +1515,7 @@ msgstr "Waga: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Handel"
@@ -1529,49 +1529,49 @@ msgstr "Handel"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "Atak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "Szept"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "Lecz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "Wyrzuć z gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr "Zmień pozycję w gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr "Zaproś do gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr "Wysadź w powietrze"
 
@@ -1589,9 +1589,9 @@ msgstr "Wysadź w powietrze"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Podejdź"
@@ -1600,7 +1600,7 @@ msgstr "Podejdź"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Rozmowa"
@@ -1611,7 +1611,7 @@ msgstr "Rozmowa"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1624,7 +1624,7 @@ msgstr "Kup"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1634,26 +1634,26 @@ msgstr "Sprzedaj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr "Dodaj komentarz"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr "Usuń z listy ataku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "Dodaj do listy priorytetów"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "Dodaj do listy atakowanych"
 
@@ -1661,7 +1661,7 @@ msgstr "Dodaj do listy atakowanych"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "Dodaj do listy ignorowanych"
 
@@ -1669,44 +1669,44 @@ msgstr "Dodaj do listy ignorowanych"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Wpisz do czatu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Gracze"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "Wyrzuć z grupy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "Podnieś"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "Dodaj do czatu"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "Portal"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "Zmień nazwę"
 
@@ -1716,20 +1716,20 @@ msgstr "Zmień nazwę"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr "Teleport"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr "Przesuwaj kamerę"
 
@@ -1738,7 +1738,7 @@ msgstr "Przesuwaj kamerę"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1746,69 +1746,69 @@ msgstr "Stroje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr "Usuń ubiór"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Zaklęcia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr "Edytuj zaklęcie"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Wyczyść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "Wyłącz alarm"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "Włącz alarm"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr "Nie usuwaj imion"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "Usuń imię"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr "Włącz tryb AFK"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr "Wyłącz tryb AFK"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Opuść"
 
@@ -1818,85 +1818,79 @@ msgstr "Opuść"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "Zaproś do grupy"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "Zmień pozycję gildii"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr "okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr "odblokuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr "zablokuj"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "Zmień nazwę drogowskazu "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "Nick:                    "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr "Komentarz gracza          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr "Komentarz:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr "Dodaj do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr "Dodaj 10 do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr "Dodaj połowę do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr "Dodaj do handlu wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr "Dodaj wszystko do handlu"
 
@@ -1905,64 +1899,64 @@ msgstr "Dodaj wszystko do handlu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Podaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "Podaj 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "Podaj połowę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr "Podaj wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "Podaj wszystko"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Pobierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "Pobierz 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "Pobierz połowę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr "Pobierz wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "Pobierz wszystko"
 
@@ -1972,7 +1966,7 @@ msgstr "Pobierz wszystko"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1982,41 +1976,41 @@ msgid "Use"
 msgstr "Użyj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr "Wyczyść okno upuszczeń."
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr "Ukryj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "Pokaż"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr "Zresetuj żółty pasek"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Skopiuj do czatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "W górę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr "W dół"
 
@@ -2024,144 +2018,150 @@ msgstr "W dół"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr "Rozbierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr "Kopiuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr "Wklej"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr "Otwórz adres internetowy"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr "Pokaż okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr "Lekceważ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignoruj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr "Czarna lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr "Ustaw jako wroga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "Dodaj do znajomych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "Odignoruj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "Podążaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "Imituj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "Kup (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "Sprzedaj (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "Zaproś do grupy"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "Pokaż przedmioty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr "Usuń z listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr "Dodaj do listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr "Przestań chronić przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr "Chroń przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Upuść..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "Upuść wszystko"
 
@@ -2169,7 +2169,7 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Upuść"
@@ -2177,49 +2177,49 @@ msgstr "Upuść"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Podziel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr "Polecenia GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr "Sprawdź IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr "Idź do"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr "Przywołaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Wskrześ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr "Wyrzuć"
 
@@ -2521,14 +2521,14 @@ msgid "Lvl: %d"
 msgstr "Poziom: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "Mana:"
+msgstr ""
 
 #: src/gui/widgets/skillinfo.cpp:107
-#, fuzzy, c-format
+#, c-format
 msgid "Range: %d"
-msgstr "Zasięg %s"
+msgstr ""
 
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
@@ -2553,13 +2553,13 @@ msgid "%s whispers: %s"
 msgstr "%s szepcze: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr "%s jest teraz Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s jest teraz Offline."
@@ -4513,7 +4513,7 @@ msgstr "Portale: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Grupa"
 
@@ -6395,9 +6395,8 @@ msgstr "Klawisz modyfikatora emotek"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
-#, fuzzy
 msgid "Pet emote modifier key"
-msgstr "Klawisz modyfikatora emotek"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:55
@@ -6435,9 +6434,8 @@ msgstr "Skrót Emotki %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "Skróty emotek"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6464,9 +6462,9 @@ msgstr "Skróty emotek"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "Skrót Emotki %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7339,9 +7337,8 @@ msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany/a przez %s."
 
 #. TRANSLATORS: chat message
 #: src/net/ea/chathandler.cpp:129
-#, fuzzy
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany/a przez %s."
+msgstr ""
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7408,49 +7405,49 @@ msgstr "Zamek gildii: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Włączono dzielenie się przedmiotami."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Wyłączono dzielenie się przedmiotami."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Nie można włączyć dzielenia się przedmiotami."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr "Stan dzielenia się przedmiotami nieznany."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Podział doświadczenia włączony."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Podział doświadczenia wyłączony."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr ""
 "Podział doświadczenia nie jest możliwy- prawdopodobnie maksymalna róznica "
 "poziomów jest większa niż 10."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr "Nieznany stan podziału doświadczenia."
 
@@ -7672,161 +7669,161 @@ msgid "Poison had no effect..."
 msgstr "Trucizna nie zadziałała..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr "Siła %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr "Zwinność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr "Żywotność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligencja %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr "Celność %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr "Szczęście %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr "Brak dostępnych serwerów."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "Ktoś inny próbuje użyć konta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "To konto jest już zalogowane."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr "Wykryto speed hack."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr "Zduplikowany login."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr "Nieznany błąd połączenia."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr "Rozłączono z serwerem!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "Siła"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "Zwinność"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "Witalność"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "Inteligencja"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "Celność"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "Szczęście"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr "Obrona"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr "Atak mag."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr "Obrona mag."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% celności"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr "% uników"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr "% ciosów kryt."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr "Opóźnienie ataku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr "Opóźnienie chodu"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr "Zasięg ataku"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr "Obrażenia na sek."
 
@@ -8302,6 +8299,24 @@ msgstr "pvp włączone, gvg włączone"
 msgid "unknown pvp"
 msgstr "nieznane pvp"
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "%s nie jest w twojej grupie!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "Gracze online"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/pt.po b/po/pt.po
index 0476949f8..2ce2e5701 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-09-09 19:11+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 19:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
 "language/pt/)\n"
@@ -171,7 +171,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
@@ -403,7 +403,7 @@ msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -413,8 +413,8 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -488,8 +488,8 @@ msgstr "Ajuda"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -619,14 +619,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
@@ -1199,8 +1199,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1474,20 +1474,20 @@ msgstr "Criar grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1511,7 +1511,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Negócios"
@@ -1525,49 +1525,49 @@ msgstr "Negócios"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "Sussuro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "Curar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "Chutar da Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr "Mudar posição da Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr "Convidar para Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr "Desaparecer"
 
@@ -1585,9 +1585,9 @@ msgstr "Desaparecer"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Mover"
@@ -1596,7 +1596,7 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Falar"
@@ -1607,7 +1607,7 @@ msgstr "Falar"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1620,7 +1620,7 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1630,26 +1630,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr "Remover da Lista de Ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "Adicionar a prioridade na lista de ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
@@ -1657,7 +1657,7 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
@@ -1665,44 +1665,44 @@ msgstr "Adicionar a lista de ignorados"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "Nome no chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "Mapa Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "Renomear"
 
@@ -1712,20 +1712,20 @@ msgstr "Renomear"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr "A Remover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr "Urdidura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr "Mover câmera"
 
@@ -1734,7 +1734,7 @@ msgstr "Mover câmera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1742,69 +1742,69 @@ msgstr "Roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr "Limpar equipamento"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr "Editar Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Limpar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr "Não remova o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "Remover nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Sair"
 
@@ -1814,85 +1814,79 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr "CopiaCopiar para a área de transferência"
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "Convidar para grupo"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr "Comentário do jogador     "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr "Adicionar todos para troca-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
@@ -1901,64 +1895,64 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Armazenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -1968,7 +1962,7 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1978,41 +1972,41 @@ msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "Mover a cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr "Mover a baixo"
 
@@ -2020,144 +2014,150 @@ msgstr "Mover a baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr "Abrir link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr "Mostrar janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr "Definir como inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "Ser Amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "Convidar para grupo"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "Mostar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr "Remover lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr "Adicionar na lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2165,7 +2165,7 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Descartar"
@@ -2173,49 +2173,49 @@ msgstr "Descartar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr "Chutar"
 
@@ -2517,9 +2517,9 @@ msgid "Lvl: %d"
 msgstr "Nível: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "Mana:"
+msgstr ""
 
 #: src/gui/widgets/skillinfo.cpp:107
 #, c-format
@@ -2549,13 +2549,13 @@ msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr "%s está online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s está offline."
@@ -4506,7 +4506,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Grupo"
 
@@ -6385,9 +6385,8 @@ msgstr "Tecla modificador de emoção"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
-#, fuzzy
 msgid "Pet emote modifier key"
-msgstr "Tecla modificador de emoção"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:55
@@ -6425,9 +6424,8 @@ msgstr "Atalho para emoticon %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "Atalhos de emoções"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6454,9 +6452,9 @@ msgstr "Atalhos de emoções"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "Atalho para emoticon %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7334,9 +7332,8 @@ msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
 
 #. TRANSLATORS: chat message
 #: src/net/ea/chathandler.cpp:129
-#, fuzzy
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
+msgstr ""
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7403,47 +7400,47 @@ msgstr "Castelo Guilda : %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Compartilhamento de itens habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr "Compartilhamento de itens desconhecido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr "Compartilhamento de experiência desconhecido."
 
@@ -7668,161 +7665,161 @@ msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr "Servidores indisponíveis."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "Outra pessoa está tentando utilizar esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "Existe alguém conectado a esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr "Login duplicado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado(a) do servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "Força"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "Agilidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "Vitalidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "Inteligência"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "Destreza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "Sorte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr "Defesa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr "Atq. Mágico"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
@@ -8295,6 +8292,24 @@ msgstr "pvp on, gvg on"
 msgid "unknown pvp"
 msgstr "pvp desconhecido"
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "%s não está em seu grupo!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "Quem esta online"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b8884f906..17d14df33 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-09-09 19:12+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 19:16+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "manaplus/language/pt_BR/)\n"
@@ -181,7 +181,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
@@ -413,7 +413,7 @@ msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -423,8 +423,8 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -498,8 +498,8 @@ msgstr "Ajuda"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -629,14 +629,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
@@ -1209,8 +1209,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1484,20 +1484,20 @@ msgstr "Criar grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1521,7 +1521,7 @@ msgstr "Peso: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Negócios"
@@ -1535,49 +1535,49 @@ msgstr "Negócios"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "Atacar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "Sussurro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "Cura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "Expulsar da guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr "Mudar pos na Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr "Convidar pra Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr "Desaparecer"
 
@@ -1595,9 +1595,9 @@ msgstr "Desaparecer"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Mover"
@@ -1606,7 +1606,7 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Falar"
@@ -1617,7 +1617,7 @@ msgstr "Falar"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1630,7 +1630,7 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1640,26 +1640,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr "Add comentário"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr "Remover da lista de ataque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "Adicionar na prioridade da lista de ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
@@ -1667,7 +1667,7 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
@@ -1675,44 +1675,44 @@ msgstr "Adicionar a lista de ignorados"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "Nome no chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "Mapa Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "Renomear"
 
@@ -1722,20 +1722,20 @@ msgstr "Renomear"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr "Remover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr "Urdidura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr "Mover câmera"
 
@@ -1744,7 +1744,7 @@ msgstr "Mover câmera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1752,69 +1752,69 @@ msgstr "Roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr "Editar feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Limpar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr "Não retire o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "Remover o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr "Habilitar modo indisponível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Sair"
 
@@ -1824,85 +1824,79 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr "Copiar para a área de transferência"
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "Convidar para grupo"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr "janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr "Desbloquear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr "Bloquear"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "Renomear mapa            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr "Comentário do jogador     "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr "Adicionar todos para troca-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
@@ -1911,64 +1905,64 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Armazenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -1978,7 +1972,7 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1988,41 +1982,41 @@ msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "Mover para cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr "Mover para baixo"
 
@@ -2030,144 +2024,150 @@ msgstr "Mover para baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr "Despir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr "Abrir endereço"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr "Mostrar Janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr "Definir como inimigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "Ser amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "vender (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "Convidar para grupo"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "Mostrar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr "Remover da lista de pegar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr "Adicionar a lista de captura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr "Desproteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr "Proteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2175,7 +2175,7 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Descartar"
@@ -2183,49 +2183,49 @@ msgstr "Descartar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Dividir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr "Comandos de GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr "Checar ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr "Ir à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr "Trazer jogador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Reviver"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr "Chutar"
 
@@ -2527,14 +2527,14 @@ msgid "Lvl: %d"
 msgstr "Nível: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "Mana:"
+msgstr ""
 
 #: src/gui/widgets/skillinfo.cpp:107
-#, fuzzy, c-format
+#, c-format
 msgid "Range: %d"
-msgstr "Alcance %s"
+msgstr ""
 
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
@@ -2559,13 +2559,13 @@ msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr "%s estão online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s estão offline."
@@ -4520,7 +4520,7 @@ msgstr "Portais: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Grupo"
 
@@ -6399,9 +6399,8 @@ msgstr "Tecla modificadora de emoção"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
-#, fuzzy
 msgid "Pet emote modifier key"
-msgstr "Tecla modificadora de emoção"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:55
@@ -6439,9 +6438,8 @@ msgstr "Atalho para emoticon %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "Atalhos de emoções"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6468,9 +6466,9 @@ msgstr "Atalhos de emoções"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "Atalho para emoticon %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7347,9 +7345,8 @@ msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
 
 #. TRANSLATORS: chat message
 #: src/net/ea/chathandler.cpp:129
-#, fuzzy
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
+msgstr ""
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7416,47 +7413,47 @@ msgstr "Castelo Guilda : %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Compartilhamento de itens habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr "Compartilhamento de itens desconhecido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr "Compartilhamento de experiência desconhecido."
 
@@ -7681,161 +7678,161 @@ msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr "Força %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr "Agilidade %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitalidade %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr "Inteligência %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr "Destreza %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr "Sorte %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr "Servidores indisponíveis."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "Outra pessoa está tentando utilizar esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "Existe alguém conectado a esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr "Login duplicado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado(a) do servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "Força"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "Agilidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "Vitalidade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "Inteligência"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "Destreza"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "Sorte"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr "Defesa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr "Atq. Mágico"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
@@ -8308,6 +8305,24 @@ msgstr "pvp ligado, gvg ligado"
 msgid "unknown pvp"
 msgstr "pvp desconhecido"
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "%s não está em seu grupo!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "Quem esta online"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index 3ecdb54a3..7aa6db2ac 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-08-30 13:31+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 19:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
 "language/ru/)\n"
@@ -177,7 +177,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Не указано название группы."
 
@@ -410,7 +410,7 @@ msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr "Вы видите %s"
@@ -420,8 +420,8 @@ msgstr "Вы видите %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "Полностью игнорировать"
 
@@ -495,8 +495,8 @@ msgstr "Помощь"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -626,14 +626,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_строка_цвета файл_назначения"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Общие"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Отладка"
@@ -1206,8 +1206,8 @@ msgstr "Огромный (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1481,20 +1481,20 @@ msgstr "Создать группу"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1518,7 +1518,7 @@ msgstr "Вес: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Торговать"
@@ -1532,49 +1532,49 @@ msgstr "Торговать"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "Атака"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "Приват"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "Лечить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "Выкинуть из гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr "Пригласить в гильдию"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr "Уничтожить"
 
@@ -1592,9 +1592,9 @@ msgstr "Уничтожить"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Движение"
@@ -1603,7 +1603,7 @@ msgstr "Движение"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Разговор"
@@ -1614,7 +1614,7 @@ msgstr "Разговор"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1627,7 +1627,7 @@ msgstr "Купить"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1637,26 +1637,26 @@ msgstr "Продать"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr "Добавить комментарий"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr "Удалить из списка атаки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "Добавить в приоритетный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "Добавить в список атаки"
 
@@ -1664,7 +1664,7 @@ msgstr "Добавить в список атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
@@ -1672,44 +1672,44 @@ msgstr "Добавить в список игнорирования"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Добавить имя в чат"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Игроки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "Поднять"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "Элемент карты"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "Переименовать"
 
@@ -1719,20 +1719,20 @@ msgstr "Переименовать"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr "Удалить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr "Прыгнуть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr "Передвинуть камеру"
 
@@ -1741,7 +1741,7 @@ msgstr "Передвинуть камеру"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1749,69 +1749,69 @@ msgstr "Наряды"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr "Очистить наряд"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Заклинания"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr "Изменить заклинание"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Очистить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr "Не скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "Скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr "Разрешить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr "Запретить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Покинуть"
 
@@ -1821,85 +1821,79 @@ msgstr "Покинуть"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "Пригласить в группу"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr "окно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr "Разблокировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr "Заблокировать"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "Имя:                     "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr "Комментарий игрока        "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr "Комментарий:                  "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr "Добавить к торговле все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
@@ -1908,64 +1902,64 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Сохранить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "Сохранить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "Сохранить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr "Сохранить все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "Сохранить все"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Получить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "Получить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr "Забрать все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "Получить все"
 
@@ -1975,7 +1969,7 @@ msgstr "Получить все"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1985,41 +1979,41 @@ msgid "Use"
 msgstr "Использовать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr "Очистить окно дропов"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr "Спрятать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "Показать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "Передвинуть выше"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -2027,144 +2021,150 @@ msgstr "Передвинуть ниже"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr "Раздеть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr "Копировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr "Вставить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr "Открыть ссылку"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr "Показать окно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr "Пренебречь"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr "Черный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr "Сделать врагом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr "Стереть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "Подружиться"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "Не игнорировать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "Следовать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "Имитировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "Пригласить в группу"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "Показать предметы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr "Удалить из поднятия"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr "Сделать поднимаемым"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr "Снять защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr "Поставить защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Бросить..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "Бросить все"
 
@@ -2172,7 +2172,7 @@ msgstr "Бросить все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Бросить"
@@ -2180,49 +2180,49 @@ msgstr "Бросить"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Разделить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr "Коменды ГМ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr "Проверить IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr "Перейти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr "Вызвать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Оживить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr "Кикнуть"
 
@@ -2524,14 +2524,14 @@ msgid "Lvl: %d"
 msgstr "Уровень: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "Мана:"
+msgstr "Мана: -%d"
 
 #: src/gui/widgets/skillinfo.cpp:107
-#, fuzzy, c-format
+#, c-format
 msgid "Range: %d"
-msgstr "Расстояние %s"
+msgstr "Дистанция: %d"
 
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
@@ -2556,13 +2556,13 @@ msgid "%s whispers: %s"
 msgstr "%s шепчет: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr "%s вошел(а)."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s вышел(а)."
@@ -4521,7 +4521,7 @@ msgstr "Порталов: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Группа"
 
@@ -5092,7 +5092,7 @@ msgstr "Аккаунт %s"
 
 #: src/gui/windows/charselectdialog.cpp:186
 msgid "Please set new pincode"
-msgstr ""
+msgstr "Пожалуйста, установите новый пин код"
 
 #. TRANSLATORS: char select dialog. player info message.
 #: src/gui/windows/charselectdialog.cpp:239
@@ -6403,9 +6403,8 @@ msgstr "Модификатор смайлов"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
-#, fuzzy
 msgid "Pet emote modifier key"
-msgstr "Модификатор смайлов"
+msgstr "Модификатор смайлов животных"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:55
@@ -6443,9 +6442,8 @@ msgstr "Комбинация клавиш для смайла %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "Ярлыки смайлов"
+msgstr "Ярлыки смайлов животных"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6472,9 +6470,9 @@ msgstr "Ярлыки смайлов"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "Комбинация клавиш для смайла %d"
+msgstr "Клавиша смайла животных %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7351,9 +7349,8 @@ msgstr "Приватное сообщение не может быть посл�
 
 #. TRANSLATORS: chat message
 #: src/net/ea/chathandler.cpp:129
-#, fuzzy
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Приватное сообщение не может быть послано: %s игнорирует его."
+msgstr "Приватное сообщение не может быть послано. Вас игнорируют все игроки."
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7420,47 +7417,47 @@ msgstr "Замки: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Обмен предметами включен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Обмен предметами выключен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Обмен предметами невозможен."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr "Статус обмена предметами неизвестен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Обмен опытом включен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Обмен опытом выключен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Обмен опытом невозможен."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr "Политика распределения опыта неизвестна."
 
@@ -7682,161 +7679,161 @@ msgid "Poison had no effect..."
 msgstr "Яд не подействовал..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr "Сила (str) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr "Выносливость (agi) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr "Живучесть (vit) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr "Интеллект (int) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr "Ловкость (dex) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr "Удача (luk) %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr "Ошибка авторизации."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr "Нет доступных серверов."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "Кто-то еще пытается воспользоваться данным аккаунтом."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "Этот аккаунт уже в сети."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr "Обнаружен взлом скорости."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr "Двойная попытка подключения."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr "Неизвестная ошибка подключения."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr "Отключено от сервера!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "Сила (str)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "Выносливость (agi)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "Живучесть (vit)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "Интеллект (int)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "Ловкость (dex)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "Удача (luk)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr "Защита"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr "Маг. Атака"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr "Маг.Защита"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Точности"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr "% Уклонения"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr "% Критический удар"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr "Задержка атаки"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr "Задержка движения"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr "Зона атаки"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr "Урон в сек."
 
@@ -8308,6 +8305,24 @@ msgstr "PVP вкл, GVG выкл"
 msgid "unknown pvp"
 msgstr "неизвестный статус PVP"
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "%s не в группе!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "Кто онлайн"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/sk.po b/po/sk.po
index bca8864a7..583be713b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/manaplus/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "Potvrdiť"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -408,8 +408,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -482,9 +482,9 @@ msgstr "Nápoveda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -492,32 +492,32 @@ msgid "Close"
 msgstr "Zatvoriť"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -531,50 +531,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1194,8 +1194,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1469,20 +1469,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1506,7 +1506,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1520,49 +1520,49 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1580,9 +1580,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1591,7 +1591,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1602,7 +1602,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1615,7 +1615,7 @@ msgstr "Kúpiť"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1625,26 +1625,26 @@ msgstr "Predaj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1652,7 +1652,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1660,44 +1660,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1707,20 +1707,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1729,7 +1729,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1737,69 +1737,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1809,85 +1809,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1896,64 +1896,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1963,51 +1963,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Použiť"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2015,144 +2015,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2160,7 +2160,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Zahodiť"
@@ -2168,49 +2168,49 @@ msgstr "Zahodiť"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2506,11 +2506,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3955,7 +3965,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4784,7 +4794,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "Vytvoriť"
@@ -4855,7 +4865,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
@@ -5009,53 +5019,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Zrušiť registráciu"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5065,16 +5079,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5711,7 +5725,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr ""
 
@@ -5726,19 +5740,19 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6063,7 +6077,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6073,17 +6087,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6357,39 +6371,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7158,111 +7211,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7382,43 +7441,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7426,327 +7486,327 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
+#. TRANSLATORS: trade header
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
+msgid "Trade: You and %s"
 msgstr ""
 
-#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
 #, c-format
-msgid "Trade: You and %s"
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: draw backend
@@ -7789,7 +7849,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
diff --git a/po/sq.po b/po/sq.po
index 5654288bb..6b4a037e7 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/manaplus/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -481,9 +481,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -491,32 +491,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -530,50 +530,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1519,49 +1519,49 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1579,9 +1579,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1590,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,7 +1651,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1659,44 +1659,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1706,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1728,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1736,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1808,85 +1808,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1895,64 +1895,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1962,51 +1962,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2014,144 +2014,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2159,7 +2159,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2167,49 +2167,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2505,11 +2505,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3954,7 +3964,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4783,7 +4793,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr ""
@@ -4854,7 +4864,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr ""
 
@@ -5008,53 +5018,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5064,16 +5078,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5708,7 +5722,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr ""
 
@@ -5723,19 +5737,19 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6060,7 +6074,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6070,17 +6084,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6354,39 +6368,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7155,111 +7208,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7379,43 +7438,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7423,327 +7483,327 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
+#. TRANSLATORS: trade header
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
+msgid "Trade: You and %s"
 msgstr ""
 
-#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
 #, c-format
-msgid "Trade: You and %s"
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: draw backend
@@ -7786,7 +7846,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 966e11565..9c05d6fe7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 19:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d vecka"
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr "%d veckor"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d dag"
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr "%d dagar"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d timme"
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr "%d timmar"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d minut"
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuter"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d sekund"
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr "missa"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
@@ -407,8 +407,8 @@ msgstr "Du ser %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -481,9 +481,9 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -491,32 +491,32 @@ msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -530,50 +530,50 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
@@ -1193,8 +1193,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1468,20 +1468,20 @@ msgstr "Skapa Party"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1505,7 +1505,7 @@ msgstr "Vikt: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Trade"
@@ -1519,49 +1519,49 @@ msgstr "Trade"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr "Attackera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr "Viska"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr "Hela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr "Kicka från guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr "Ändra position i guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr "Bjud in till guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1579,9 +1579,9 @@ msgstr "Nuke"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Flytta"
@@ -1590,7 +1590,7 @@ msgstr "Flytta"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Prata med"
@@ -1601,7 +1601,7 @@ msgstr "Prata med"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr "Köp"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr "Sälj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr "Ta bort från attacklistan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr "Lägg till i prioriteringslistan för attack"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr "Lägg till i attacklistan"
 
@@ -1651,7 +1651,7 @@ msgstr "Lägg till i attacklistan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
@@ -1659,44 +1659,44 @@ msgstr "Lägg till i ignoreringslistan"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr "Lägg till namnet i chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr "Kicka från party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr "Kartobjekt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr "Ändra namn"
 
@@ -1706,20 +1706,20 @@ msgstr "Ändra namn"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr "Warpa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr "Rör kamera"
 
@@ -1728,7 +1728,7 @@ msgstr "Rör kamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1736,69 @@ msgstr "Utstyrsel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr "Ändra spell"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Clear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr "Inaktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr "Aktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr "Ta inte bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr "Ta bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr "Aktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr "Avaktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Lämna"
 
@@ -1808,85 +1808,85 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr "Döp om kartskyltar       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr "Namn:                    "
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr "Lägg till för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr "Lägg till 10 för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr "Lägg till hälften för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr "Lägg till trade alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -1895,64 +1895,64 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Lagra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr "Lagra 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr "Lagra hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Ta emot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr "Hämta ut hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr "Hämta ut alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -1962,51 +1962,51 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2014,144 +2014,144 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr "Visa fönster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr "Imitation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr "Lägg till i pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2159,7 +2159,7 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Släng"
@@ -2167,49 +2167,49 @@ msgstr "Släng"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Dela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Återuppliva"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr "Sparka"
 
@@ -2505,11 +2505,21 @@ msgid "Edit"
 msgstr "Ändra"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3954,7 +3964,7 @@ msgstr "Tillåt viskningar"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4783,7 +4793,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "Skapa"
@@ -4854,7 +4864,7 @@ msgstr "E-postadressen matchar inte."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr "Ändra Lösenord"
 
@@ -5008,53 +5018,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Är du säker på att du vill radera denna karaktär?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Konto %s (senaste inloggning var %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr "Ändra inloggad"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Spela"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr "Info"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Avregistrera"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr "Ändra lösenord"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr "Konto %s"
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5064,16 +5078,16 @@ msgid ""
 "Money: %s"
 msgstr "Hp: %u/%u⏎\nMp: %u/%u⏎\nLevel: %u⏎\nExperience: %u⏎\nMoney: %s"
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr "Felaktigt lösenord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr "Skriv in lösenordet för att radera karaktär"
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr "Skriv lösenord:"
 
@@ -5708,7 +5722,7 @@ msgstr "Auktion"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr "Efterfråga Trade"
 
@@ -5723,19 +5737,19 @@ msgid "Up"
 msgstr "Upp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Skill points tillgängliga: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr "Skill Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
@@ -6060,7 +6074,7 @@ msgid "Completed"
 msgstr "Färdig"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Vem är Online - Uppdaterar"
 
@@ -6070,17 +6084,17 @@ msgid "Update"
 msgstr "Uppdaterar"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Vem är Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Vem är Online - error"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Vem är Online - Uppdatering"
 
@@ -6354,39 +6368,78 @@ msgstr "Emote-modifierande knapp"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr "Emote-genvägar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emote-genväg %d"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr "Flytta och välj"
@@ -7155,111 +7208,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Avaktivera OpenGL för denna session"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Strength:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Agility:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Vitality:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Luck:"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Åtkomst nekad. Trolig orsak; det är för många spelare på denna server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr "Kan inte använda detta ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är taget."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr "Fel namn."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr "Icke korrekta stats."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr "Icke korrekt hår."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr "Icke korrekt slot."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr "Felaktig race."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr "Icke korrekt utseende."
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr "Karaktär raderad."
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr "Misslyckades att radera karaktär."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Viskning kunde inte sändas, %s är offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Viskning kunde inte sändas, ignorerad av %s."
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr "Spel"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr "Efterfrågning att avsluta nekad!"
 
@@ -7379,43 +7438,44 @@ msgid "New password too short."
 msgstr "Det nya lösenordet är för kort."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr "Okänt fel."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr "Oregistrerat ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr "Fel lösenord."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr "Kotot har löpt ut ur tid."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr "Nekad från servern."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr "Klienten är uråldrig."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7423,329 +7483,329 @@ msgid ""
 msgstr "Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-teamet via forumet."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr "Servern är överbefolkad."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr "Detta användarnamn är redan taget."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr "Felaktig epost."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr "Användarnamnet är permanent raderat."
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr "Tom adress given till Network::connect()!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr "Kan inte host:a \""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr "Anslutningen till servern avslutad. "
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr "Meddelande"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr "Du bär på mer än halva din vikt. Du kan inte återfå health."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr "Trade misslyckades!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr "Emote misslyckades!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr "Sit misslyckades!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr "Chat-skapning misslyckades!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr "Kunde inte joina partyt!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr "Kan inte skjuta!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du har ännu inte nått required lvl!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr "Otillräckligt HP!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr "Otillräckligt SP!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr "Du har inga memos!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr "Du kan inte göra det just nu!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Verkar som att du behöver mer money... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kan inte använda denna skill med det vapnet!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "Du behöver en till röd gem!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå gem!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr "Du bär för mycket för att kunna göra detta!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr "Huh? Vad är det?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr "Warp failed..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr "Kan inte stjäla något..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr "Poison hade ingen effekt..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr "Strength %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr "Agility %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitality %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr "Intelligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr "Dexterity %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr "Luck %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr "Inga servrar tillgängliga."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr "Någon annan försöker använda detta konto."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr "Detta konto är redan inloggat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr "Speed hack upptäckt."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr "Duplicerad Inloggning."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr "Okänt anslutningsfel."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr "Du blev frånkopplad från servern!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr "Strength"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr "Agility"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr "Vitality"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr "Dexterity"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr "Luck"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr "Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr "M.Attack"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr "M.Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical Hit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr "Attack Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr "Walk Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr "Attack Range"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr "Damage per sec."
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s vill trade:a med dig, accepterar du?"
-
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Trade: Du och %s"
 
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s vill trade:a med dig, accepterar du?"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7786,7 +7846,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Inte namngiven"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 0dbfd6b0b..d381a9607 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 19:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
 "manaplus/language/sv_SE/)\n"
@@ -168,7 +168,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Gruppnamn saknas."
 
@@ -400,7 +400,7 @@ msgid "Imitation canceled"
 msgstr "Imitation avbruten"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr "Du ser %s"
@@ -410,8 +410,8 @@ msgstr "Du ser %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -485,8 +485,8 @@ msgstr "Hjälp"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -616,14 +616,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
@@ -1196,8 +1196,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1471,20 +1471,20 @@ msgstr "Skapa Party"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1508,7 +1508,7 @@ msgstr "Vikt: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Trade"
@@ -1522,49 +1522,49 @@ msgstr "Trade"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "Attackera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "Viska"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "Hela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "Kicka från guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr "Ändra position i guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr "Bjud in till guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1582,9 +1582,9 @@ msgstr "Nuke"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Flytta"
@@ -1593,7 +1593,7 @@ msgstr "Flytta"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Prata med"
@@ -1604,7 +1604,7 @@ msgstr "Prata med"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1617,7 +1617,7 @@ msgstr "Köp"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1627,26 +1627,26 @@ msgstr "Sälj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr "Ta bort från attacklistan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "Lägg till i prioriteringslistan för attack"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "Lägg till i attacklistan"
 
@@ -1654,7 +1654,7 @@ msgstr "Lägg till i attacklistan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
@@ -1662,44 +1662,44 @@ msgstr "Lägg till i ignoreringslistan"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Lägg till namnet i chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "Kicka från party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "Kartobjekt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "Ändra namn"
 
@@ -1709,20 +1709,20 @@ msgstr "Ändra namn"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr "Warpa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr "Rör kamera"
 
@@ -1731,7 +1731,7 @@ msgstr "Rör kamera"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1739,69 +1739,69 @@ msgstr "Utstyrsel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr "Ändra spell"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Clear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "Inaktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "Aktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr "Ta inte bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "Ta bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr "Aktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr "Avaktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Lämna"
 
@@ -1811,85 +1811,79 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "Bjud in till party"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "Döp om kartskyltar       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "Namn:                    "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr "Lägg till för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr "Lägg till 10 för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr "Lägg till hälften för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr "Lägg till trade alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -1898,64 +1892,64 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Lagra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "Lagra 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "Lagra hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Ta emot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "Hämta ut hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr "Hämta ut alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -1965,7 +1959,7 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1975,41 +1969,41 @@ msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2017,144 +2011,150 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr "Visa fönster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "Imitation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "Bjud in till party"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr "Lägg till i pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2162,7 +2162,7 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Släng"
@@ -2170,49 +2170,49 @@ msgstr "Släng"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Dela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Återuppliva"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr "Sparka"
 
@@ -2514,9 +2514,9 @@ msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "Mana:"
+msgstr ""
 
 #: src/gui/widgets/skillinfo.cpp:107
 #, c-format
@@ -2546,13 +2546,13 @@ msgid "%s whispers: %s"
 msgstr "%s viskar: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr "%s är nu Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s är nu Offline."
@@ -4504,7 +4504,7 @@ msgstr "Portaler: %u/%u"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Party"
 
@@ -6386,9 +6386,8 @@ msgstr "Emote-modifierande knapp"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
-#, fuzzy
 msgid "Pet emote modifier key"
-msgstr "Emote-modifierande knapp"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:55
@@ -6426,9 +6425,8 @@ msgstr "Emote-genväg %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "Emote-genvägar"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6455,9 +6453,9 @@ msgstr "Emote-genvägar"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "Emote-genväg %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7335,9 +7333,8 @@ msgstr "Viskning kunde inte sändas, ignorerad av %s."
 
 #. TRANSLATORS: chat message
 #: src/net/ea/chathandler.cpp:129
-#, fuzzy
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Viskning kunde inte sändas, ignorerad av %s."
+msgstr ""
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7404,47 +7401,47 @@ msgstr "Guild slott: %s"
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Item-delning aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Item-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Item-delning är inte möjlig."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr "Item-delning okänd."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "Exp-delning är aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "Exp-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "Exp-delning är inte möjlig."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr "Exp-delning är okänd."
 
@@ -7664,161 +7661,161 @@ msgid "Poison had no effect..."
 msgstr "Poison hade ingen effekt..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr "Strength %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr "Agility %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr "Vitality %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr "Intelligence %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr "Dexterity %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr "Luck %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr "Inga servrar tillgängliga."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "Någon annan försöker använda detta konto."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "Detta konto är redan inloggat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr "Speed hack upptäckt."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr "Duplicerad Inloggning."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr "Okänt anslutningsfel."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr "Du blev frånkopplad från servern!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "Strength"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "Agility"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "Vitality"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "Dexterity"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "Luck"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr "Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr "M.Attack"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr "M.Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical Hit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr "Attack Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr "Walk Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr "Attack Range"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr "Damage per sec."
 
@@ -8290,6 +8287,24 @@ msgstr "pvp på, gvg på"
 msgid "unknown pvp"
 msgstr "okänd pvp"
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "%s är inte i ditt party!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "Vem är online"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/te.po b/po/te.po
index 5f42c6f38..c0530cad0 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/manaplus/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "సరే"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -407,8 +407,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -481,9 +481,9 @@ msgstr "సహాయం"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -491,32 +491,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -530,50 +530,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "పొరపాటు"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1193,8 +1193,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1468,20 +1468,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1505,7 +1505,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1519,49 +1519,49 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1579,9 +1579,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1590,7 +1590,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1601,7 +1601,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1614,7 +1614,7 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1624,26 +1624,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1651,7 +1651,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1659,44 +1659,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "ఆటగాళ్ళు"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1706,20 +1706,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1728,7 +1728,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1736,69 +1736,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1808,85 +1808,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1895,64 +1895,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1962,51 +1962,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2014,144 +2014,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2159,7 +2159,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2167,49 +2167,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2505,11 +2505,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3954,7 +3964,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4783,7 +4793,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "సృష్టించు"
@@ -4854,7 +4864,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr "సంకేతపదాన్ని మార్చు"
 
@@ -5008,53 +5018,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5064,16 +5078,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5708,7 +5722,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr ""
 
@@ -5723,19 +5737,19 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6060,7 +6074,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6070,17 +6084,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6354,39 +6368,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7155,111 +7208,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7379,43 +7438,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7423,327 +7483,327 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
+#. TRANSLATORS: trade header
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
+msgid "Trade: You and %s"
 msgstr ""
 
-#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
 #, c-format
-msgid "Trade: You and %s"
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: draw backend
@@ -7786,7 +7846,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 7b04bd94f..0db930da2 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Thai (http://www.transifex.com/projects/p/manaplus/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -406,8 +406,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -480,9 +480,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -490,32 +490,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -529,50 +529,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "ผิดพลาด"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1192,8 +1192,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1467,20 +1467,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1504,7 +1504,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1518,49 +1518,49 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1578,9 +1578,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1589,7 +1589,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1600,7 +1600,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1613,7 +1613,7 @@ msgstr "ซื้อ"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1623,26 +1623,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1650,7 +1650,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1658,44 +1658,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1705,20 +1705,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1727,7 +1727,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1735,69 +1735,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1807,85 +1807,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1894,64 +1894,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1961,51 +1961,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "ใช้"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2013,144 +2013,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2158,7 +2158,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "ทิ้ง"
@@ -2166,49 +2166,49 @@ msgstr "ทิ้ง"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2504,11 +2504,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3953,7 +3963,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4782,7 +4792,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "สร้าง"
@@ -4853,7 +4863,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
@@ -5007,53 +5017,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5063,16 +5077,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5705,7 +5719,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr ""
 
@@ -5720,19 +5734,19 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6057,7 +6071,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6067,17 +6081,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6351,39 +6365,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7152,111 +7205,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7376,43 +7435,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7420,327 +7480,327 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
+#. TRANSLATORS: trade header
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
+msgid "Trade: You and %s"
 msgstr ""
 
-#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
 #, c-format
-msgid "Trade: You and %s"
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: draw backend
@@ -7783,7 +7843,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index dfcc55184..26cd0d12d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
 "language/tr/)\n"
@@ -170,7 +170,7 @@ msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "Grup adı eksik."
 
@@ -402,7 +402,7 @@ msgid "Imitation canceled"
 msgstr "Taklit iptal edildi"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -412,8 +412,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "Tamamen görmezden gel"
 
@@ -487,8 +487,8 @@ msgstr "Yardım"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -618,14 +618,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "Genel"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Hata ayıklama"
@@ -1198,8 +1198,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1473,20 +1473,20 @@ msgstr "Grup kur"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1510,7 +1510,7 @@ msgstr "Ağırlık: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Takas"
@@ -1524,49 +1524,49 @@ msgstr "Takas"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "Saldırı"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr ""
 
@@ -1584,9 +1584,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Taşı"
@@ -1595,7 +1595,7 @@ msgstr "Taşı"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Konuş"
@@ -1606,7 +1606,7 @@ msgstr "Konuş"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1619,7 +1619,7 @@ msgstr "Satın Al"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1629,26 +1629,26 @@ msgstr "Sat"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr ""
 
@@ -1656,7 +1656,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr "Gözmezden gelinenler listesine ekle"
 
@@ -1664,44 +1664,44 @@ msgstr "Gözmezden gelinenler listesine ekle"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Oyuncular"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "Gruptan at"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "Sohbete ekle"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "Harita nesnesi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr ""
 
@@ -1711,20 +1711,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr ""
 
@@ -1733,7 +1733,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1741,69 +1741,69 @@ msgstr "Kıyafetler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Büyüler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Temizle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "Vurgulamayı kapat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "Vurgulamayı aç"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Ayrıl"
 
@@ -1813,85 +1813,79 @@ msgstr "Ayrıl"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr "Gruba davet et"
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "Lonca pozisyonunu değiştir"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "Harita işaretini tekrar adlandır "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "İsim:                    "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr "Takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr "10 tanesini takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr "Yarısını takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr "Tamamını takasa ekle-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr "Tamamını takasa ekle"
 
@@ -1900,64 +1894,64 @@ msgstr "Tamamını takasa ekle"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "Sakla 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "Yarısını sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr "Tamamını sakla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "Tamamını sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Almak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "Geri al 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "Yarısını geri al"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "Tamamını geri al"
 
@@ -1967,7 +1961,7 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1977,41 +1971,41 @@ msgid "Use"
 msgstr "Kullan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr ""
 
@@ -2019,144 +2013,150 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr "İhmal et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Görmezden gel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr "Görmezden gelmeyi bırak"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr "Taklit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "Satın Al (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr "Gruba davet et"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "Nesneleri göster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr "Toplama listesinden kaldır"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr "Toplama listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Bırak..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr ""
 
@@ -2164,7 +2164,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Bırak"
@@ -2172,49 +2172,49 @@ msgstr "Bırak"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Bölme"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr ""
 
@@ -2516,9 +2516,9 @@ msgid "Lvl: %d"
 msgstr "Level: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "Mana:"
+msgstr ""
 
 #: src/gui/widgets/skillinfo.cpp:107
 #, c-format
@@ -2548,13 +2548,13 @@ msgid "%s whispers: %s"
 msgstr "%s %s'e fısıldıyor:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4502,7 +4502,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Grup"
 
@@ -6416,9 +6416,8 @@ msgstr "Duygu Kısayolu %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "Duygu Kısayolu %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6445,9 +6444,9 @@ msgstr "Duygu Kısayolu %d"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "Duygu Kısayolu %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7320,9 +7319,8 @@ msgstr "Fısıltı gönderilemedi, %s tarafından görmezden gelindi."
 
 #. TRANSLATORS: chat message
 #: src/net/ea/chathandler.cpp:129
-#, fuzzy
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Fısıltı gönderilemedi, %s tarafından görmezden gelindi."
+msgstr ""
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7389,47 +7387,47 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "Nesne paylaşımı etkinleştirildi."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "Nesne paylaşımı devre dışı bırakıldı."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "Nesne paylaşımı mümkün değil."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr "Nesne paylaşımı bilinmiyor."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -7646,161 +7644,161 @@ msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "Başka birisi bu hesabı kullanmaya çalışıyor."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "Zaten bu hesaba bağlanıldı."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "Güç"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "Çeviklik"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "Yaşam Gücü"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "Zeka"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "Maharet"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "Şans"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr ""
 
@@ -8272,6 +8270,24 @@ msgstr ""
 msgid "unknown pvp"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "%s grubunda değil!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "Kimler Online"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/vls.po b/po/vls.po
index aaf69e7d3..dfcea0a3b 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Vlaams (http://www.transifex.com/projects/p/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -42,110 +42,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -299,12 +299,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -406,8 +406,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -480,9 +480,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -490,32 +490,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -529,50 +529,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1192,8 +1192,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1467,20 +1467,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1504,7 +1504,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr ""
@@ -1518,49 +1518,49 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1578,9 +1578,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1589,7 +1589,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1600,7 +1600,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1613,7 +1613,7 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1623,26 +1623,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1650,7 +1650,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1658,44 +1658,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1705,20 +1705,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1727,7 +1727,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1735,69 +1735,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1807,85 +1807,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1894,64 +1894,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1961,51 +1961,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2013,144 +2013,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2158,7 +2158,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr ""
@@ -2166,49 +2166,49 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2504,11 +2504,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3953,7 +3963,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4782,7 +4792,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr ""
@@ -4853,7 +4863,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr ""
 
@@ -5007,53 +5017,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5063,16 +5077,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5707,7 +5721,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr ""
 
@@ -5722,19 +5736,19 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6059,7 +6073,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6069,17 +6083,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6353,39 +6367,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7154,111 +7207,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7378,43 +7437,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7422,327 +7482,327 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
+#. TRANSLATORS: trade header
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
+msgid "Trade: You and %s"
 msgstr ""
 
-#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
 #, c-format
-msgid "Trade: You and %s"
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: draw backend
@@ -7785,7 +7845,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 063a93e95..4179a1d24 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-09 20:33+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-10 21:55+0300\n"
+"PO-Revision-Date: 2014-09-10 19:03+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -173,7 +173,7 @@ msgstr "无法为 \"%s\"创建私信标签！要么已经存在，要么是你�
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:79
+#: src/actions/chat.cpp:265 src/net/ea/gui/partytab.cpp:80
 msgid "Party name is missing."
 msgstr "帮会名称缺失."
 
@@ -404,7 +404,7 @@ msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3170
+#: src/being/localplayer.cpp:3174
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -414,8 +414,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
-#: src/gui/popups/popupmenu.cpp:2644
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2626
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -489,8 +489,8 @@ msgstr "帮助"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
-#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:645
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -620,14 +620,14 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:483
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:252 src/gui/widgets/tabs/chattab.cpp:485
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "调试"
@@ -1200,8 +1200,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2365 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1475,20 +1475,20 @@ msgstr "建立"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
-#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
-#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
-#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
-#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
-#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
-#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
-#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:317
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:461
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:543
+#: src/gui/popups/popupmenu.cpp:574 src/gui/popups/popupmenu.cpp:599
+#: src/gui/popups/popupmenu.cpp:624 src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:833 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:2029 src/gui/popups/popupmenu.cpp:2065
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2198 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2344 src/gui/popups/popupmenu.cpp:2378
+#: src/gui/popups/popupmenu.cpp:2404 src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2446 src/gui/popups/popupmenu.cpp:2471
+#: src/gui/popups/popupmenu.cpp:2488 src/gui/popups/popupmenu.cpp:2783
+#: src/gui/popups/popupmenu.cpp:2909 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1512,7 +1512,7 @@ msgstr "重量：%s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
+#: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:718
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "交易"
@@ -1526,49 +1526,49 @@ msgstr "交易"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
-#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:297
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:269
+#: src/gui/popups/popupmenu.cpp:721 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:300
 msgid "Attack"
 msgstr "攻击"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:386
 msgid "Whisper"
 msgstr "密语"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
+#: src/gui/popups/popupmenu.cpp:174 src/gui/popups/popupmenu.cpp:725
 msgid "Heal"
 msgstr "愈合"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
-#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:194 src/gui/popups/popupmenu.cpp:210
+#: src/gui/popups/popupmenu.cpp:432 src/gui/popups/popupmenu.cpp:751
 msgid "Kick from guild"
 msgstr "踢从公会"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
-#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
+#: src/gui/popups/popupmenu.cpp:201 src/gui/popups/popupmenu.cpp:217
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:758
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:227 src/gui/popups/popupmenu.cpp:449
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:233
+#: src/gui/popups/popupmenu.cpp:234
 msgid "Nuke"
 msgstr ""
 
@@ -1586,9 +1586,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
-#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
-#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
+#: src/gui/popups/popupmenu.cpp:237 src/gui/popups/popupmenu.cpp:258
+#: src/gui/popups/popupmenu.cpp:416 src/gui/popups/popupmenu.cpp:567
+#: src/gui/popups/popupmenu.cpp:732 src/gui/popups/popupmenu.cpp:792
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "移动"
@@ -1597,7 +1597,7 @@ msgstr "移动"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "说话"
@@ -1608,7 +1608,7 @@ msgstr "说话"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2657
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1621,7 +1621,7 @@ msgstr "购买"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:2660
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1631,26 +1631,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:261 src/gui/popups/popupmenu.cpp:396
+#: src/gui/popups/popupmenu.cpp:2745
 msgid "Add comment"
 msgstr "发表评论"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:280
+#: src/gui/popups/popupmenu.cpp:281
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:288
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:291
+#: src/gui/popups/popupmenu.cpp:292
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
@@ -1658,7 +1658,7 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
+#: src/gui/popups/popupmenu.cpp:296 src/gui/popups/popupmenu.cpp:2765
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1666,44 +1666,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
+#: src/gui/popups/popupmenu.cpp:312 src/gui/popups/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:342 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
-#: src/gui/popups/popupmenu.cpp:2723
+#: src/gui/popups/popupmenu.cpp:408 src/gui/popups/popupmenu.cpp:2705
+#: src/gui/popups/popupmenu.cpp:2729
 msgid "Kick from party"
 msgstr "踢从党"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
+#: src/gui/popups/popupmenu.cpp:490 src/gui/popups/popupmenu.cpp:499
 msgid "Pick up"
 msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
-#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2101 src/gui/popups/popupmenu.cpp:2143
 msgid "Add to chat"
 msgstr "加入聊天"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
+#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:557
 msgid "Map Item"
 msgstr "地图项"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:527
+#: src/gui/popups/popupmenu.cpp:528
 msgid "Rename"
 msgstr "重命名"
 
@@ -1713,20 +1713,20 @@ msgstr "重命名"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2392
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2374
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:563
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:570
 msgid "Move camera"
 msgstr ""
 
@@ -1735,7 +1735,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:588 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1743,69 +1743,69 @@ msgstr "套装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:590
+#: src/gui/popups/popupmenu.cpp:591
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:617 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "法术"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:619
+#: src/gui/popups/popupmenu.cpp:620
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:650 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:657
 msgid "Disable highlight"
 msgstr "禁用"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:663
 msgid "Enable highlight"
 msgstr "启用突出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:669
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Remove name"
 msgstr "移除姓名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:680
+#: src/gui/popups/popupmenu.cpp:681
 msgid "Enable away"
 msgstr "启用远"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:686
+#: src/gui/popups/popupmenu.cpp:687
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "留下"
 
@@ -1815,85 +1815,79 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
-#: src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:699 src/gui/popups/popupmenu.cpp:2442
+#: src/gui/popups/popupmenu.cpp:2484
 msgid "Copy to clipboard"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
-msgid "Invite to party"
-msgstr ""
-
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:833
+#: src/gui/popups/popupmenu.cpp:815
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:860
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:910
+#: src/gui/popups/popupmenu.cpp:892
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1405
+#: src/gui/popups/popupmenu.cpp:1387
 msgid "Rename map sign          "
 msgstr "重命名的地图标志          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1407
+#: src/gui/popups/popupmenu.cpp:1389
 msgid "Name:                    "
 msgstr "名称：                   "
 
-#: src/gui/popups/popupmenu.cpp:1431
+#: src/gui/popups/popupmenu.cpp:1413
 msgid "Player comment            "
 msgstr "玩家评论                  "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1433
+#: src/gui/popups/popupmenu.cpp:1415
 msgid "Comment:                      "
 msgstr "评论：                       "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1960
+#: src/gui/popups/popupmenu.cpp:1942
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1967
+#: src/gui/popups/popupmenu.cpp:1949
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1971
+#: src/gui/popups/popupmenu.cpp:1953
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1974
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1977
+#: src/gui/popups/popupmenu.cpp:1959
 msgid "Add to trade all"
 msgstr ""
 
@@ -1902,64 +1896,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
-#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2138 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "存储"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Store 10"
 msgstr "商店10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1978
 msgid "Store half"
 msgstr "商店的一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:1981
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:1984
 msgid "Store all"
 msgstr "商店所有"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1996 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2003
 msgid "Retrieve 10"
 msgstr "拿出10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2007
 msgid "Retrieve half"
 msgstr "拿出一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2010
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2031
+#: src/gui/popups/popupmenu.cpp:2013
 msgid "Retrieve all"
 msgstr "检索所有"
 
@@ -1969,7 +1963,7 @@ msgstr "检索所有"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2833
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
 #: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
@@ -1979,41 +1973,41 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2171
+#: src/gui/popups/popupmenu.cpp:2153
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
+#: src/gui/popups/popupmenu.cpp:2184 src/gui/popups/popupmenu.cpp:2245
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2191 src/gui/popups/popupmenu.cpp:2252
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2277
+#: src/gui/popups/popupmenu.cpp:2259
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2263 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
+#: src/gui/popups/popupmenu.cpp:2303 src/gui/popups/popupmenu.cpp:2322
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
 msgid "Move down"
 msgstr ""
 
@@ -2021,144 +2015,150 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2742
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2418
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/gui/popups/popupmenu.cpp:2421
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2457
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2475
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
+#: src/gui/popups/popupmenu.cpp:2530 src/gui/popups/popupmenu.cpp:2566
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2623
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
-#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2569
+#: src/gui/popups/popupmenu.cpp:2608 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2611
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2539 src/gui/popups/popupmenu.cpp:2572
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
-#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
-#: src/gui/popups/popupmenu.cpp:2632
+#: src/gui/popups/popupmenu.cpp:2542 src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/popups/popupmenu.cpp:2596
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2552
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:2563 src/gui/popups/popupmenu.cpp:2581
+#: src/gui/popups/popupmenu.cpp:2593 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2620
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2657
+#: src/gui/popups/popupmenu.cpp:2639
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
+#: src/gui/popups/popupmenu.cpp:2667 src/gui/popups/popupmenu.cpp:2682
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
+#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2685
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2733
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2699 src/gui/popups/popupmenu.cpp:2723
+msgid "Invite to party"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2750
+#: src/gui/popups/popupmenu.cpp:2756
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2755
+#: src/gui/popups/popupmenu.cpp:2761
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2804
+#: src/gui/popups/popupmenu.cpp:2810
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2813
+#: src/gui/popups/popupmenu.cpp:2819
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2848 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2851
 msgid "Drop all"
 msgstr "所有"
 
@@ -2166,7 +2166,7 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2857 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "丢弃"
@@ -2174,49 +2174,49 @@ msgstr "丢弃"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2865 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "分离"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2869
+#: src/gui/popups/popupmenu.cpp:2875
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2883
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2882
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2885
+#: src/gui/popups/popupmenu.cpp:2891
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2888
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:2897 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2896
+#: src/gui/popups/popupmenu.cpp:2902
 msgid "Kick"
 msgstr ""
 
@@ -2518,9 +2518,9 @@ msgid "Lvl: %d"
 msgstr "等级: %d"
 
 #: src/gui/widgets/skillinfo.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Mana: -%d"
-msgstr "法力:"
+msgstr ""
 
 #: src/gui/widgets/skillinfo.cpp:107
 #, c-format
@@ -2550,13 +2550,13 @@ msgid "%s whispers: %s"
 msgstr "%s私语:%s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:557
+#: src/gui/widgets/tabs/chattab.cpp:558
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chattab.cpp:562
+#: src/gui/widgets/tabs/chattab.cpp:563
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4501,7 +4501,7 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:47
+#: src/gui/widgets/tabs/socialpartytab.h:51 src/net/ea/gui/partytab.cpp:48
 msgid "Party"
 msgstr "t"
 
@@ -6411,9 +6411,8 @@ msgstr "表情快捷键为 %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:354
-#, fuzzy
 msgid "Pet emote shortcuts"
-msgstr "表情快捷键为 %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
@@ -6440,9 +6439,9 @@ msgstr "表情快捷键为 %d"
 #: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
 #: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
 #: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
-#, fuzzy, c-format
+#, c-format
 msgid "Pet emote shortcut %d"
-msgstr "表情快捷键为 %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
@@ -7315,9 +7314,8 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #: src/net/ea/chathandler.cpp:129
-#, fuzzy
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "密语无法发送，%s离线."
+msgstr ""
 
 #: src/net/ea/gamehandler.cpp:75
 msgid "Game"
@@ -7384,47 +7382,47 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:107 src/resources/notifications.h:179
 msgid "Item sharing enabled."
 msgstr "物品共享开启."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:112 src/resources/notifications.h:183
 msgid "Item sharing disabled."
 msgstr "物品共享关闭."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:117 src/resources/notifications.h:187
 msgid "Item sharing not possible."
 msgstr "物品共享不可能."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:121
+#: src/net/ea/gui/partytab.cpp:122
 msgid "Item sharing unknown."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:157 src/resources/notifications.h:167
 msgid "Experience sharing enabled."
 msgstr "经验共享开启."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:162 src/resources/notifications.h:171
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:167 src/resources/notifications.h:175
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/gui/partytab.cpp:171
+#: src/net/ea/gui/partytab.cpp:172
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -7643,161 +7641,161 @@ msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:114 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
+#: src/net/eathena/generalhandler.cpp:115 src/net/tmwa/generalhandler.cpp:121
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:147
 msgid "Authentication failed."
 msgstr "身份验证失败."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:141 src/net/tmwa/generalhandler.cpp:151
 msgid "No servers available."
 msgstr "没有可用的服务器."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
+#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:157
 msgid "Someone else is trying to use this account."
 msgstr "别人尝试使用该帐户."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:151 src/net/tmwa/generalhandler.cpp:163
 msgid "This account is already logged in."
 msgstr "此帐户已登录."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
+#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:168
 msgid "Speed hack detected."
 msgstr "检测速度劈."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
+#: src/net/eathena/generalhandler.cpp:158 src/net/tmwa/generalhandler.cpp:172
 msgid "Duplicated login."
 msgstr "重复登录."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:161 src/net/tmwa/generalhandler.cpp:176
 msgid "Unknown connection error."
 msgstr "未知的连接错误."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
+#: src/net/eathena/generalhandler.cpp:236 src/net/tmwa/generalhandler.cpp:259
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:287
 msgid "Strength"
 msgstr "力量"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:289
 msgid "Agility"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:291
 msgid "Vitality"
 msgstr "生命"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:293
 msgid "Intelligence"
 msgstr "智慧"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:295
 msgid "Dexterity"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:297
 msgid "Luck"
 msgstr "幸运"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:302
 msgid "Defense"
 msgstr "防御"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:304
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:306
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Accuracy"
 msgstr "％精度"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Evade"
 msgstr "％闪避"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:315
 #, no-c-format
 msgid "% Critical"
 msgstr "％"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:317
 msgid "Attack Delay"
 msgstr "攻击延迟"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:319
 msgid "Walk Delay"
 msgstr "步行延迟"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:321
 msgid "Attack Range"
 msgstr "攻击范围"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:323
 msgid "Damage per sec."
 msgstr "每秒伤害."
 
@@ -8269,6 +8267,24 @@ msgstr ""
 msgid "unknown pvp"
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:315
+#, fuzzy, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "%s不在你的帮会中!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:319
+#, c-format
+msgid "%s blocked invite!"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:323
+#, fuzzy
+msgid "Char is not online!"
+msgstr "谁在线"
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format
diff --git a/po/zh_HK.po b/po/zh_HK.po
index cc19a1944..d69b619af 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/manaplus/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "確定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -406,8 +406,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -480,9 +480,9 @@ msgstr "說明"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -490,32 +490,32 @@ msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -529,50 +529,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1192,8 +1192,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1467,20 +1467,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1504,7 +1504,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "交易"
@@ -1518,49 +1518,49 @@ msgstr "交易"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1578,9 +1578,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1589,7 +1589,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr ""
@@ -1600,7 +1600,7 @@ msgstr ""
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1613,7 +1613,7 @@ msgstr "購買"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1623,26 +1623,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1650,7 +1650,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1658,44 +1658,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1705,20 +1705,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1727,7 +1727,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1735,69 +1735,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1807,85 +1807,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1894,64 +1894,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1961,51 +1961,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2013,144 +2013,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2158,7 +2158,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "丟棄"
@@ -2166,49 +2166,49 @@ msgstr "丟棄"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "分開"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2504,11 +2504,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3953,7 +3963,7 @@ msgstr "允許密語"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4782,7 +4792,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "創造"
@@ -4853,7 +4863,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr ""
 
@@ -5007,53 +5017,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "開始"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "註冊"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5063,16 +5077,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5705,7 +5719,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr ""
 
@@ -5720,19 +5734,19 @@ msgid "Up"
 msgstr "升級"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6057,7 +6071,7 @@ msgid "Completed"
 msgstr "已完成"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6067,17 +6081,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6351,39 +6365,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7152,111 +7205,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7376,43 +7435,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7420,327 +7480,327 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr "力量"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr "體力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr "智力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr "閃躲"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr "幸運"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
+#. TRANSLATORS: trade header
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
+msgid "Trade: You and %s"
 msgstr ""
 
-#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
 #, c-format
-msgid "Trade: You and %s"
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: draw backend
@@ -7783,7 +7843,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 31ece44cc..d44fabd07 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-30 09:53+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-09-10 08:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/manaplus/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,110 +43,110 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "確定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -300,12 +300,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -406,8 +406,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr ""
 
@@ -480,9 +480,9 @@ msgstr "說明"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -490,32 +490,32 @@ msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr ""
 
@@ -529,50 +529,50 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1192,8 +1192,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1467,20 +1467,20 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1504,7 +1504,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "交易"
@@ -1518,49 +1518,49 @@ msgstr "交易"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr "攻擊"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr ""
 
@@ -1578,9 +1578,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1589,7 +1589,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "說話"
@@ -1600,7 +1600,7 @@ msgstr "說話"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1613,7 +1613,7 @@ msgstr "購買"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1623,26 +1623,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr ""
 
@@ -1650,7 +1650,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1658,44 +1658,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr ""
 
@@ -1705,20 +1705,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr ""
 
@@ -1727,7 +1727,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1735,69 +1735,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1807,85 +1807,85 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr ""
 
@@ -1894,64 +1894,64 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "寄放"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr ""
 
@@ -1961,51 +1961,51 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr ""
 
@@ -2013,144 +2013,144 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr ""
 
@@ -2158,7 +2158,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "丟棄"
@@ -2166,49 +2166,49 @@ msgstr "丟棄"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "分開"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr ""
 
@@ -2504,11 +2504,21 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, c-format
+msgid "Mana: -%d"
+msgstr ""
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, c-format
+msgid "Range: %d"
+msgstr ""
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3953,7 +3963,7 @@ msgstr "允許密語"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4782,7 +4792,7 @@ msgstr "減少"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "創造"
@@ -4853,7 +4863,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr "變更密碼"
 
@@ -5007,53 +5017,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "開始"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr "資訊"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "取消註冊"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5063,16 +5077,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr ""
 
@@ -5705,7 +5719,7 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr "要求交易"
 
@@ -5720,19 +5734,19 @@ msgid "Up"
 msgstr "升級"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6057,7 +6071,7 @@ msgid "Completed"
 msgstr "已完成"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -6067,17 +6081,17 @@ msgid "Update"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -6351,39 +6365,78 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+msgid "Pet emote modifier key"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情捷徑鍵 %d"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+msgid "Pet emote shortcuts"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, c-format
+msgid "Pet emote shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr ""
@@ -7152,111 +7205,117 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -7376,43 +7435,44 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7420,329 +7480,329 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr "力量"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr "體力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr "智力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr "閃躲"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr "幸運"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr ""
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s 請求交易, 是否接受?"
-
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s 請求交易, 是否接受?"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7783,7 +7843,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "未知物品"
author	Andrei Karas <akaras@inbox.ru>	2014-09-10 22:18:11 +0300
committer	Andrei Karas <akaras@inbox.ru>	2014-09-10 22:29:51 +0300
commit	df9dfd472e9f69ae27e2ab694e1897ef8a46a58f (patch)
tree	e794d21225318f599edf52b161f6271c15b9424c
parent	30dd29914106af4dc98a191e95544d95f480c03d (diff)
download	plus-df9dfd472e9f69ae27e2ab694e1897ef8a46a58f.tar.gz plus-df9dfd472e9f69ae27e2ab694e1897ef8a46a58f.tar.bz2 plus-df9dfd472e9f69ae27e2ab694e1897ef8a46a58f.tar.xz plus-df9dfd472e9f69ae27e2ab694e1897ef8a46a58f.zip