Update translations.

1 files changed, 543 insertions, 489 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index e616fde9b..400dad39e 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-12-11 12:20+0300\n"
-"PO-Revision-Date: 2014-12-11 10:00+0000\n"
+"POT-Creation-Date: 2014-12-28 19:54+0300\n"
+"PO-Revision-Date: 2014-12-29 09:57+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"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:131
+#: src/actions/actions.cpp:139
 msgid "File uploaded"
 msgstr ""
 
@@ -33,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:133 src/client.cpp:1473 src/client.cpp:1500
+#: src/actions/actions.cpp:141 src/client.cpp:1473 src/client.cpp:1500
 #: src/gamemodifiers.cpp:424 src/gui/dialogsmanager.cpp:156
 #: src/gui/dialogsmanager.cpp:172 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
@@ -44,231 +44,234 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:399
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
-#: src/gui/windows/charcreatedialog.cpp:371
+#: src/gui/windows/charcreatedialog.cpp:373
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/charselectdialog.cpp:311 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:68
-#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:502
+#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
 #: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:83
-#: src/net/eathena/charserverhandler.cpp:540
-#: src/net/eathena/charserverhandler.cpp:570
+#: src/net/eathena/charserverhandler.cpp:541
+#: src/net/eathena/charserverhandler.cpp:571
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:738 src/actions/actions.cpp:750
+#: src/actions/actions.cpp:890 src/actions/actions.cpp:902
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:878 src/actions/actions.cpp:934
+#: src/actions/actions.cpp:1030 src/actions/actions.cpp:1086
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:889
+#: src/actions/actions.cpp:1041
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:889
+#: src/actions/actions.cpp:1041
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:900
+#: src/actions/actions.cpp:1052
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:900
+#: src/actions/actions.cpp:1052
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:910
+#: src/actions/actions.cpp:1062
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:910
+#: src/actions/actions.cpp:1062
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:920
+#: src/actions/actions.cpp:1072
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:920
+#: src/actions/actions.cpp:1072
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:930
+#: src/actions/actions.cpp:1082
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:930
+#: src/actions/actions.cpp:1082
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:991 src/actions/actions.cpp:1000
+#: src/actions/actions.cpp:1143 src/actions/actions.cpp:1152
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:994 src/actions/actions.cpp:1003
+#: src/actions/actions.cpp:1146 src/actions/actions.cpp:1155
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1091
+#: src/actions/actions.cpp:1243
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1210
+#: src/actions/actions.cpp:1362
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1219
+#: src/actions/actions.cpp:1371
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1228
+#: src/actions/actions.cpp:1380
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:241
+#: src/actions/chat.cpp:242
 msgid "Cannot send empty whispers!"
 msgstr "Cannot send empty whispers!"
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:272
+#: src/actions/chat.cpp:290
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr ""
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:297 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:315 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr "Party name is missing."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:333
 msgid "Guild name is missing."
 msgstr ""
 
 #. TRANSLATORS: party invite message
+#. TRANSLATORS: guild invite message
+#. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:337 src/actions/commands.cpp:64
+#: src/actions/chat.cpp:354 src/actions/chat.cpp:381 src/actions/chat.cpp:446
+#: src/actions/commands.cpp:72
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Return toggles chat."
 msgstr "Return toggles chat."
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr "Message closes chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr "Return now toggles chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr "Message now closes chat."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:107
+#: src/actions/commands.cpp:114
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:119
+#: src/actions/commands.cpp:127
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:129
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:160
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:161
+#: src/actions/commands.cpp:169
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:171
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:178
+#: src/actions/commands.cpp:186
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:199
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:201
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:200
+#: src/actions/commands.cpp:208
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:215
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:214
+#: src/actions/commands.cpp:222
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:229
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:236
 msgid "enemy"
 msgstr ""
 
@@ -288,25 +291,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:394
+#: src/being/being.cpp:395
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "dodge"
 msgstr "dodge"
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr "miss"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1889 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1895 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1894 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr ""
 
@@ -418,8 +421,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:2738
-#: src/gui/popups/popupmenu.cpp:2780
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2296
+#: src/gui/popups/popupmenu.cpp:2338
 msgid "Completely ignore"
 msgstr ""
 
@@ -493,9 +496,9 @@ msgstr "Help"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:945 src/client.cpp:1401 src/client.cpp:1415
-#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:722
-#: src/gui/popups/popupmenu.cpp:955 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:225 src/gui/windows/npcdialog.cpp:74
+#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:715
+#: src/gui/popups/popupmenu.cpp:949 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
 #: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:83
 msgid "Close"
@@ -546,14 +549,14 @@ msgstr "Changing game servers"
 #: src/client.cpp:1399 src/client.cpp:1413 src/client.cpp:1608
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:367
+#: src/gui/windows/charcreatedialog.cpp:369
 #: src/gui/windows/charselectdialog.cpp:309
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:243
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
-#: src/net/eathena/charserverhandler.cpp:523
-#: src/net/eathena/charserverhandler.cpp:525
+#: src/net/eathena/charserverhandler.cpp:524
+#: src/net/eathena/charserverhandler.cpp:526
 msgid "Error"
 msgstr "Error"
 
@@ -1050,7 +1053,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:129 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/dialogsmanager.cpp:129 src/gui/popups/popupmenu.cpp:2617
 msgid "Revive"
 msgstr ""
 
@@ -1234,8 +1237,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2519 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1999
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr ""
 
@@ -1486,7 +1489,7 @@ msgstr ""
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:499
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:502
 msgid "Create Party"
 msgstr ""
 
@@ -1509,23 +1512,23 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:374
-#: src/gui/popups/popupmenu.cpp:441 src/gui/popups/popupmenu.cpp:537
-#: src/gui/popups/popupmenu.cpp:584 src/gui/popups/popupmenu.cpp:619
-#: src/gui/popups/popupmenu.cpp:650 src/gui/popups/popupmenu.cpp:675
-#: src/gui/popups/popupmenu.cpp:700 src/gui/popups/popupmenu.cpp:884
-#: src/gui/popups/popupmenu.cpp:911 src/gui/popups/popupmenu.cpp:944
-#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2311
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2498 src/gui/popups/popupmenu.cpp:2532
-#: src/gui/popups/popupmenu.cpp:2558 src/gui/popups/popupmenu.cpp:2579
-#: src/gui/popups/popupmenu.cpp:2600 src/gui/popups/popupmenu.cpp:2625
-#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2952
-#: src/gui/popups/popupmenu.cpp:3078 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:367
+#: src/gui/popups/popupmenu.cpp:434 src/gui/popups/popupmenu.cpp:530
+#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:612
+#: src/gui/popups/popupmenu.cpp:643 src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:693 src/gui/popups/popupmenu.cpp:878
+#: src/gui/popups/popupmenu.cpp:905 src/gui/popups/popupmenu.cpp:938
+#: src/gui/popups/popupmenu.cpp:1741 src/gui/popups/popupmenu.cpp:1777
+#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1910 src/gui/popups/popupmenu.cpp:1978
+#: src/gui/popups/popupmenu.cpp:2056 src/gui/popups/popupmenu.cpp:2090
+#: src/gui/popups/popupmenu.cpp:2116 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2158 src/gui/popups/popupmenu.cpp:2183
+#: src/gui/popups/popupmenu.cpp:2200 src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:2629 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:58
 #: src/gui/windows/changepassworddialog.cpp:60
-#: src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charcreatedialog.cpp:129
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/itemamountwindow.cpp:160
@@ -1546,7 +1549,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:158 src/gui/popups/popupmenu.cpp:788
 #: src/gui/widgets/tabs/chat/tradetab.cpp:35
 msgid "Trade"
 msgstr "Trade"
@@ -1561,54 +1564,50 @@ msgstr "Trade"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:284
-#: src/gui/popups/popupmenu.cpp:798 src/gui/widgets/skillinfo.cpp:114
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:277
+#: src/gui/popups/popupmenu.cpp:791 src/gui/widgets/skillinfo.cpp:114
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:375 src/net/tmwa/generalhandler.cpp:326
+#: src/net/eathena/generalhandler.cpp:378 src/net/tmwa/generalhandler.cpp:329
 msgid "Attack"
 msgstr "Attack"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: whisper to npc
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:259
-#: src/gui/popups/popupmenu.cpp:462
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:252
+#: src/gui/popups/popupmenu.cpp:455
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:795
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:828
+#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
+#: src/gui/popups/popupmenu.cpp:501 src/gui/popups/popupmenu.cpp:821
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:835
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:508 src/gui/popups/popupmenu.cpp:828
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:232 src/gui/popups/popupmenu.cpp:525
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:224 src/gui/popups/popupmenu.cpp:518
+#: src/gui/popups/popupmenu.cpp:840
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:239
+#: src/gui/popups/popupmenu.cpp:231
 msgid "Nuke"
 msgstr ""
 
@@ -1626,9 +1625,9 @@ msgstr ""
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:492 src/gui/popups/popupmenu.cpp:643
-#: src/gui/popups/popupmenu.cpp:809 src/gui/popups/popupmenu.cpp:869
+#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:485 src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:802 src/gui/popups/popupmenu.cpp:863
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr ""
@@ -1637,7 +1636,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:143
 msgid "Talk"
 msgstr "Talk"
@@ -1649,9 +1648,9 @@ msgstr "Talk"
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2811
-#: src/gui/windows/buydialog.cpp:183 src/gui/windows/buydialog.cpp:199
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buyselldialog.cpp:71
+#: src/gui/popups/popupmenu.cpp:256 src/gui/popups/popupmenu.cpp:2369
+#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
+#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
 #: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:144
 msgid "Buy"
 msgstr "Buy"
@@ -1664,7 +1663,7 @@ msgstr "Buy"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2814
+#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:2372
 #: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
 #: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
 #: src/resources/db/npcdb.cpp:145
@@ -1675,26 +1674,26 @@ msgstr "Sell"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:275 src/gui/popups/popupmenu.cpp:472
-#: src/gui/popups/popupmenu.cpp:2914
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:465
+#: src/gui/popups/popupmenu.cpp:2472
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:296
+#: src/gui/popups/popupmenu.cpp:289
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:296
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:307
+#: src/gui/popups/popupmenu.cpp:300
 msgid "Add to attack list"
 msgstr ""
 
@@ -1702,19 +1701,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:2934
+#: src/gui/popups/popupmenu.cpp:304 src/gui/popups/popupmenu.cpp:2492
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:320 src/gui/popups/popupmenu.cpp:331
+#: src/gui/popups/popupmenu.cpp:313 src/gui/popups/popupmenu.cpp:324
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:324
+#: src/gui/popups/popupmenu.cpp:317
 msgid "Fire"
 msgstr ""
 
@@ -1722,19 +1721,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:334 src/gui/popups/popupmenu.cpp:345
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:338
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:348
+#: src/gui/popups/popupmenu.cpp:341
 msgid "Drop loot"
 msgstr ""
 
@@ -1742,8 +1741,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:174 src/resources/itemtypemapdata.h:47
+#: src/gui/popups/popupmenu.cpp:344 src/gui/windows/equipmentwindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
 #: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1755,7 +1754,7 @@ msgstr "Unequip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:348
 msgid "Return to egg"
 msgstr ""
 
@@ -1763,44 +1762,44 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:369 src/gui/popups/popupmenu.cpp:533
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:526
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:418 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:411 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:484 src/gui/popups/popupmenu.cpp:2859
-#: src/gui/popups/popupmenu.cpp:2883
+#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:2417
+#: src/gui/popups/popupmenu.cpp:2441
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:566 src/gui/popups/popupmenu.cpp:575
+#: src/gui/popups/popupmenu.cpp:559 src/gui/popups/popupmenu.cpp:568
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:580 src/gui/popups/popupmenu.cpp:2179
-#: src/gui/popups/popupmenu.cpp:2255 src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1813 src/gui/popups/popupmenu.cpp:1855
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:601 src/gui/popups/popupmenu.cpp:633
+#: src/gui/popups/popupmenu.cpp:594 src/gui/popups/popupmenu.cpp:626
 msgid "Map Item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windows/charselectdialog.cpp:130
+#: src/gui/popups/popupmenu.cpp:597 src/gui/windows/charselectdialog.cpp:130
 msgid "Rename"
 msgstr ""
 
@@ -1810,20 +1809,20 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:2494
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:600 src/gui/popups/popupmenu.cpp:2052
+#: src/gui/popups/popupmenu.cpp:2086
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:614 src/gui/popups/popupmenu.cpp:639
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:632
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:639
 msgid "Move camera"
 msgstr ""
 
@@ -1832,77 +1831,77 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:664 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:657 src/gui/setupinputpages.cpp:53
+#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:192
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:660
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:693 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:686 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:696
+#: src/gui/popups/popupmenu.cpp:689
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:727 src/gui/windows/npcdialog.cpp:109
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:734
+#: src/gui/popups/popupmenu.cpp:727
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:746
+#: src/gui/popups/popupmenu.cpp:739
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:745
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:758
+#: src/gui/popups/popupmenu.cpp:751
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:764
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:771 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr ""
 
@@ -1912,79 +1911,71 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:776 src/gui/popups/popupmenu.cpp:2596
-#: src/gui/popups/popupmenu.cpp:2638
+#: src/gui/popups/popupmenu.cpp:769 src/gui/popups/popupmenu.cpp:2154
+#: src/gui/popups/popupmenu.cpp:2196
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:893
+#: src/gui/popups/popupmenu.cpp:887
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:938
+#: src/gui/popups/popupmenu.cpp:932
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:964
+#: src/gui/popups/popupmenu.cpp:958
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:970
+#: src/gui/popups/popupmenu.cpp:964
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1480
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1482
+#: src/gui/popups/popupmenu.cpp:1014
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:1506
+#: src/gui/popups/popupmenu.cpp:1038
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1508
+#: src/gui/popups/popupmenu.cpp:1040
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:2096
+#: src/gui/popups/popupmenu.cpp:1642
 msgid "Add to trade"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:2103
+#: src/gui/popups/popupmenu.cpp:1650
 msgid "Add to trade 10"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:2107
+#: src/gui/popups/popupmenu.cpp:1655
 msgid "Add to trade half"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:2110
+#: src/gui/popups/popupmenu.cpp:1659
 msgid "Add to trade all-1"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:1663
 msgid "Add to trade all"
 msgstr ""
 
@@ -1993,64 +1984,48 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2251
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:717 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1671 src/gui/popups/popupmenu.cpp:1809
+#: src/gui/popups/popupmenu.cpp:1850 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:718 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:2128
+#: src/gui/popups/popupmenu.cpp:1679
 msgid "Store 10"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:2132
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Store half"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:2135
+#: src/gui/popups/popupmenu.cpp:1688
 msgid "Store all-1"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:2138
+#: src/gui/popups/popupmenu.cpp:1692
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2150 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1704 src/gui/windows/inventorywindow.cpp:224
 msgid "Retrieve"
 msgstr "Retrieve"
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:1712
 msgid "Retrieve 10"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:1717
 msgid "Retrieve half"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2164
+#: src/gui/popups/popupmenu.cpp:1721
 msgid "Retrieve all-1"
 msgstr ""
 
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2167
+#: src/gui/popups/popupmenu.cpp:1725
 msgid "Retrieve all"
 msgstr ""
 
@@ -2060,9 +2035,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:3002
-#: src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:630 src/gui/windows/skilldialog.cpp:81
+#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:2560
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:631 src/gui/windows/skilldialog.cpp:81
 #: src/gui/windows/skilldialog.cpp:153 src/gui/windows/skilldialog.cpp:323
 #: src/gui/windows/skilldialog.cpp:456 src/gui/windows/skilldialog.cpp:538
 #: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2070,41 +2045,41 @@ msgid "Use"
 msgstr "Use"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:1865
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2338 src/gui/popups/popupmenu.cpp:2399
+#: src/gui/popups/popupmenu.cpp:1896 src/gui/popups/popupmenu.cpp:1957
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2345 src/gui/popups/popupmenu.cpp:2406
+#: src/gui/popups/popupmenu.cpp:1903 src/gui/popups/popupmenu.cpp:1964
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2417 src/gui/windows/statuswindow.cpp:93
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2457 src/gui/popups/popupmenu.cpp:2476
+#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2482
+#: src/gui/popups/popupmenu.cpp:2021 src/gui/popups/popupmenu.cpp:2040
 msgid "Move down"
 msgstr ""
 
@@ -2112,155 +2087,155 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2911
+#: src/gui/popups/popupmenu.cpp:2112 src/gui/popups/popupmenu.cpp:2469
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2130
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2133
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2151
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2169
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2684 src/gui/popups/popupmenu.cpp:2720
-#: src/gui/popups/popupmenu.cpp:2759 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2278
+#: src/gui/popups/popupmenu.cpp:2317 src/gui/popups/popupmenu.cpp:2335
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2687 src/gui/popups/popupmenu.cpp:2723
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
+#: src/gui/popups/popupmenu.cpp:2320 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2690 src/gui/popups/popupmenu.cpp:2765
+#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2323
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2284
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2696 src/gui/popups/popupmenu.cpp:2729
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2750
-#: src/gui/popups/popupmenu.cpp:2768
+#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2326
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2717 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2747 src/gui/popups/popupmenu.cpp:2756
-#: src/gui/popups/popupmenu.cpp:2774
+#: src/gui/popups/popupmenu.cpp:2275 src/gui/popups/popupmenu.cpp:2293
+#: src/gui/popups/popupmenu.cpp:2305 src/gui/popups/popupmenu.cpp:2314
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2351
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Imitation"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2821 src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2379 src/gui/popups/popupmenu.cpp:2394
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2824 src/gui/popups/popupmenu.cpp:2839
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2853 src/gui/popups/popupmenu.cpp:2877
+#: src/gui/popups/popupmenu.cpp:2411 src/gui/popups/popupmenu.cpp:2435
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popups/popupmenu.cpp:2900
+#: src/gui/popups/popupmenu.cpp:2458
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2908
+#: src/gui/popups/popupmenu.cpp:2466
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2925
+#: src/gui/popups/popupmenu.cpp:2483
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:2488
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2979
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2988
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:3017 src/gui/windows/inventorywindow.cpp:187
-#: src/gui/windows/inventorywindow.cpp:725
+#: src/gui/popups/popupmenu.cpp:2575 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:726
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:3020
+#: src/gui/popups/popupmenu.cpp:2578
 msgid "Drop all"
 msgstr ""
 
@@ -2268,50 +2243,43 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:3026 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:730
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
 msgid "Drop"
 msgstr "Drop"
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: split items
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:3034 src/gui/windows/inventorywindow.cpp:189
-msgid "Split"
-msgstr "Split"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:3044
+#: src/gui/popups/popupmenu.cpp:2595
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3052
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:3057
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:3060
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:3063
+#: src/gui/popups/popupmenu.cpp:2614
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:3071
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Kick"
 msgstr ""
 
@@ -2359,8 +2327,9 @@ msgstr "Chat"
 #: src/gui/widgets/tabs/setup_chat.cpp:179
 #: src/gui/widgets/tabs/setup_other.cpp:337
 #: src/gui/widgets/tabs/setup_visual.cpp:192
-#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/charcreatedialog.cpp:119
 #: src/gui/windows/registerdialog.cpp:104 src/input/pages/gui.cpp:87
+#: src/input/pages/other.cpp:108
 msgid "Other"
 msgstr ""
 
@@ -2598,7 +2567,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:555 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:556 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:234 src/gui/windows/statuswindow.cpp:341
 #, c-format
 msgid "Money: %s"
@@ -2620,7 +2589,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:262
+#: src/gui/widgets/selldialog.cpp:98 src/gui/windows/buydialog.cpp:264
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/serverdialog.cpp:124
 #: src/input/pages/basic.cpp:216
@@ -2633,7 +2602,7 @@ msgstr "Exit"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:254
+#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
 #: src/gui/windows/itemamountwindow.cpp:156
 #: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:105
 #: src/gui/windows/statuswindow.cpp:745
@@ -2646,7 +2615,7 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:257
+#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
 #: src/gui/windows/itemamountwindow.cpp:154
 #: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:107
 #: src/gui/windows/statuswindow.cpp:758
@@ -2658,7 +2627,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:264
+#: src/gui/widgets/selldialog.cpp:120 src/gui/windows/buydialog.cpp:266
 #: src/gui/windows/statuswindow.cpp:488 src/gui/windows/statuswindow.cpp:543
 #: src/gui/windows/statuswindow.cpp:742 src/gui/windows/statuswindow.cpp:774
 msgid "Max"
@@ -2666,8 +2635,8 @@ msgstr "Max"
 
 #. TRANSLATORS: sell dialog label
 #. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:311
-#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buydialog.cpp:525
+#: src/gui/widgets/selldialog.cpp:127 src/gui/widgets/selldialog.cpp:322
+#: src/gui/windows/buydialog.cpp:242 src/gui/windows/buydialog.cpp:549
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Price: %s / Total: %s"
@@ -3859,7 +3828,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:194
 msgid "Shop"
 msgstr "Shop"
 
@@ -3988,7 +3957,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:404
 msgid "Upload log file"
 msgstr ""
 
@@ -4915,7 +4884,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -4926,8 +4895,8 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
-#: src/inventory.cpp:297
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
+#: src/inventory.cpp:299
 msgid "Inventory"
 msgstr "Inventory"
 
@@ -5068,19 +5037,19 @@ msgid "Result"
 msgstr ""
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:167
+#: src/gui/windows/buydialog.cpp:169
 msgid "Create items"
 msgstr ""
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:249
+#: src/gui/windows/buydialog.cpp:251
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/buydialog.cpp:262 src/gui/windows/charcreatedialog.cpp:127
 #: src/gui/windows/charselectdialog.cpp:601
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
@@ -5168,7 +5137,7 @@ msgid "The new password entries mismatch."
 msgstr ""
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:75
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr ""
 
@@ -5176,7 +5145,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog label
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
-#: src/gui/windows/charcreatedialog.cpp:81
+#: src/gui/windows/charcreatedialog.cpp:83
 #: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:104
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
@@ -5186,11 +5155,11 @@ msgstr "Name:"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/charcreatedialog.cpp:94
-#: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:191
-#: src/gui/windows/charcreatedialog.cpp:201
+#: src/gui/windows/charcreatedialog.cpp:87
+#: src/gui/windows/charcreatedialog.cpp:96
+#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:193
+#: src/gui/windows/charcreatedialog.cpp:203
 #: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
@@ -5199,72 +5168,72 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:89
-#: src/gui/windows/charcreatedialog.cpp:96
-#: src/gui/windows/charcreatedialog.cpp:193
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:205
 #: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:91
+#: src/gui/windows/charcreatedialog.cpp:93
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:109
+#: src/gui/windows/charcreatedialog.cpp:111
 msgid "^"
 msgstr ""
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charcreatedialog.cpp:115
 #: src/gui/windows/registerdialog.cpp:98
 msgid "Male"
 msgstr "Male"
 
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: register dialog. button.
-#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/charcreatedialog.cpp:117
 #: src/gui/windows/registerdialog.cpp:100
 msgid "Female"
 msgstr "Female"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:123
-#: src/gui/windows/charcreatedialog.cpp:479
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Please distribute %d points"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:369
+#: src/gui/windows/charcreatedialog.cpp:371
 msgid "Your name needs to be at least 4 characters."
 msgstr "Your name needs to be at least 4 characters."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Character stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:485
+#: src/gui/windows/charcreatedialog.cpp:487
 #, c-format
 msgid "Please remove %d points"
 msgstr "Please remove %d points"
@@ -5307,8 +5276,8 @@ msgstr "Play"
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:80
 #: src/net/ea/charserverhandler.cpp:160
-#: src/net/eathena/charserverhandler.cpp:538
-#: src/net/eathena/charserverhandler.cpp:568
+#: src/net/eathena/charserverhandler.cpp:539
+#: src/net/eathena/charserverhandler.cpp:569
 msgid "Info"
 msgstr "Info"
 
@@ -5377,7 +5346,7 @@ msgid "Whispering to %s: %s"
 msgstr "Whispering to %s: %s"
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1653 src/net/eathena/pethandler.cpp:167
+#: src/gui/windows/chatwindow.cpp:1678 src/net/eathena/pethandler.cpp:166
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5494,7 +5463,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:170 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:171 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
 #: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
 #: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5505,6 +5474,11 @@ msgstr ""
 msgid "Equip"
 msgstr "Equip"
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr "Split"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5989,11 +5963,11 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:186
+#: src/gui/windows/shopwindow.cpp:782 src/net/ea/tradehandler.cpp:173
 msgid "Request for Trade"
 msgstr "Request for Trade"
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6042,111 +6016,111 @@ msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:419
+#: src/gui/windows/socialwindow.cpp:420
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Received party request, but one already exists."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:454
+#: src/gui/windows/socialwindow.cpp:456
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:459
+#: src/gui/windows/socialwindow.cpp:461
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:468
+#: src/gui/windows/socialwindow.cpp:470
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s has invited you to join their party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:474
+#: src/gui/windows/socialwindow.cpp:476
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s has invited you to join the %s party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Accept Party Invite"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:503
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:514
 msgid "Choose your party's name."
 msgstr ""
 
@@ -6295,12 +6269,12 @@ msgid "You give:"
 msgstr "You give:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr "You don't have enough money."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:493
+#: src/gui/windows/tradewindow.cpp:495
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Failed adding item. You can not overlap one kind of item on the window."
@@ -6321,27 +6295,27 @@ msgstr "Updating..."
 msgid "Connecting..."
 msgstr "Connecting..."
 
-#: src/gui/windows/updaterwindow.cpp:405
+#: src/gui/windows/updaterwindow.cpp:406
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:831
+#: src/gui/windows/updaterwindow.cpp:832
 msgid "##1  The update process is incomplete."
 msgstr "##1  The update process is incomplete."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:833
+#: src/gui/windows/updaterwindow.cpp:834
 msgid "##1  It is strongly recommended that"
 msgstr "##1  It is strongly recommended that"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:835
+#: src/gui/windows/updaterwindow.cpp:836
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1019
+#: src/gui/windows/updaterwindow.cpp:1020
 msgid "Completed"
 msgstr "Completed"
 
@@ -6742,22 +6716,22 @@ msgid "Move & selection"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:39 src/input/pages/move.cpp:43
+#: src/input/pages/gui.cpp:39
 msgid "Move Up"
 msgstr "Move Up"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:45 src/input/pages/move.cpp:49
+#: src/input/pages/gui.cpp:45
 msgid "Move Down"
 msgstr "Move Down"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:51 src/input/pages/move.cpp:55
+#: src/input/pages/gui.cpp:51
 msgid "Move Left"
 msgstr "Move Left"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:57 src/input/pages/move.cpp:61
+#: src/input/pages/gui.cpp:57
 msgid "Move Right"
 msgstr "Move Right"
 
@@ -6817,18 +6791,56 @@ msgid "Move Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/move.cpp:43
+msgid "Move player up"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/move.cpp:49
+msgid "Move player down"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/move.cpp:55
+msgid "Move player left"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/move.cpp:61
+msgid "Move player right"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
-msgid "Move Forward"
+msgid "Move player forward"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
+msgid "Move pet up"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/move.cpp:79
+msgid "Move pet down"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/move.cpp:85
+msgid "Move pet left"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/move.cpp:91
+msgid "Move pet right"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/move.cpp:97
 msgid "Move to navigation point shortcuts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/move.cpp:79 src/input/pages/move.cpp:85
-#: src/input/pages/move.cpp:91 src/input/pages/move.cpp:97
 #: src/input/pages/move.cpp:103 src/input/pages/move.cpp:109
 #: src/input/pages/move.cpp:115 src/input/pages/move.cpp:121
 #: src/input/pages/move.cpp:127 src/input/pages/move.cpp:133
@@ -6851,286 +6863,328 @@ msgstr ""
 #: src/input/pages/move.cpp:331 src/input/pages/move.cpp:337
 #: src/input/pages/move.cpp:343 src/input/pages/move.cpp:349
 #: src/input/pages/move.cpp:355 src/input/pages/move.cpp:361
+#: src/input/pages/move.cpp:367 src/input/pages/move.cpp:373
+#: src/input/pages/move.cpp:379 src/input/pages/move.cpp:385
 #, c-format
 msgid "Move to point Shortcut %d"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-msgid "Ignore input 1"
-msgstr "Ignore input 1"
+msgid "Input ignore"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
-msgstr "Ignore input 2"
+msgid "Ignore input 1"
+msgstr "Ignore input 1"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
-msgstr ""
+msgid "Ignore input 2"
+msgstr "Ignore input 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-msgid "Direct Down"
+msgid "Direction keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
-msgid "Direct Left"
+msgid "Player direct up"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-msgid "Direct Right"
+msgid "Player direct down"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-msgid "Crazy moves"
+msgid "Player direct left"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-msgid "Change Crazy Move mode"
+msgid "Player direct right"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-msgid "Quick Drop N Items from 0 slot"
+msgid "Pet direct up"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-msgid "Quick Drop N Items"
+msgid "Pet direct down"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-msgid "Switch Quick Drop Counter"
+msgid "Pet direct left"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
+msgid "Pet direct right"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:114
+msgid "Crazy moves"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:120
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:126
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:132
+msgid "Quick Drop N Items"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:138
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:144
 msgid "Quick heal target or self"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:108
+#: src/input/pages/other.cpp:150
 msgid "Use #itenplz spell"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:114
+#: src/input/pages/other.cpp:156
 msgid "Use magic attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:120
+#: src/input/pages/other.cpp:162
 msgid "Switch magic attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:126
+#: src/input/pages/other.cpp:168
 msgid "Switch pvp attack"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:132
+#: src/input/pages/other.cpp:174
 msgid "Change move type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:138
+#: src/input/pages/other.cpp:180
 msgid "Change Attack Weapon Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:144
+#: src/input/pages/other.cpp:186
 msgid "Change Attack Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:150
+#: src/input/pages/other.cpp:192
 msgid "Change Follow mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:156
+#: src/input/pages/other.cpp:198
 msgid "Change Imitation mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:162
+#: src/input/pages/other.cpp:204
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:168
+#: src/input/pages/other.cpp:210
 msgid "On / Off audio"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:174
+#: src/input/pages/other.cpp:216
 msgid "Enable / Disable away mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:180
+#: src/input/pages/other.cpp:222
 msgid "Emulate right click from keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:186
+#: src/input/pages/other.cpp:228
 msgid "Toggle camera mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:192
+#: src/input/pages/other.cpp:234
 msgid "Toggle ipc mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:198
+#: src/input/pages/other.cpp:240
 msgid "Show information about position in chat"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:204
+#: src/input/pages/other.cpp:246
 msgid "Show online players number in chat"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:210
+#: src/input/pages/other.cpp:252
 msgid "Show onscreen keyboard"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:216
+#: src/input/pages/other.cpp:258
 msgid "Clean cached graphics"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:222
+#: src/input/pages/other.cpp:264
 msgid "Clean cached fonts"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:228
+#: src/input/pages/other.cpp:270
 msgid "Print visible players in chat"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:234
+#: src/input/pages/other.cpp:276
 msgid "Print all visible beings in chat"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:240
+#: src/input/pages/other.cpp:282
 msgid "Load shop items list from disk"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:246
+#: src/input/pages/other.cpp:288
 msgid "Save shop items list to disk"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:252
+#: src/input/pages/other.cpp:294
 msgid "Print debug cache info"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:258
+#: src/input/pages/other.cpp:300
 msgid "Undress selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:264
+#: src/input/pages/other.cpp:306
 msgid "Quick disconnect from server"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:270
+#: src/input/pages/other.cpp:312
 msgid "Disable debug particle"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:276
+#: src/input/pages/other.cpp:318
 msgid "Create items (for gms)"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:282
+#: src/input/pages/other.cpp:324
 msgid "Print configured directories in chat"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:288
+#: src/input/pages/other.cpp:330
 msgid "Print client uptime in chat"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:294
+#: src/input/pages/other.cpp:336
 msgid "Dump debug information"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:300
+#: src/input/pages/other.cpp:342
 msgid "Crash client"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:306
+#: src/input/pages/other.cpp:348
 msgid "Dump graphics info into chat"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:312
+#: src/input/pages/other.cpp:354
 msgid "Dump tests info into chat"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:318
+#: src/input/pages/other.cpp:360
 msgid "Print OpenGL version in chat"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:324
+#: src/input/pages/other.cpp:366
 msgid "Print enabled mods in chat"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:330
+#: src/input/pages/other.cpp:372
 msgid "Dump environments into log"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:336
+#: src/input/pages/other.cpp:378
 msgid "Dump OpenGL state into log"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:343
+#: src/input/pages/other.cpp:385
 msgid "Test SDL font speed"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:350
+#: src/input/pages/other.cpp:392
 msgid "Upload main config"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:356
+#: src/input/pages/other.cpp:398
 msgid "Upload server config"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:368
+#: src/input/pages/other.cpp:410
 msgid "Fire your mercenary"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:416
+msgid "Pet ai start"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:422
+msgid "Pet ai stop"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/outfits.cpp:37
 msgid "Outfits keys"
 msgstr ""
@@ -7385,12 +7439,12 @@ msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:302
+#: src/inventory.cpp:304
 msgid "Storage"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:307
+#: src/inventory.cpp:309
 msgid "Cart"
 msgstr ""
 
@@ -7545,8 +7599,8 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:283
-#: src/net/eathena/loginhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:247
+#: src/net/eathena/loginhandler.cpp:218
 msgid "Wrong name."
 msgstr ""
 
@@ -7664,59 +7718,38 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
-msgid "Account was not found. Please re-login."
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
-msgid "Old password incorrect."
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166
-msgid "New password too short."
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:170 src/net/ea/loginhandler.cpp:295
-#: src/net/eathena/loginhandler.cpp:239
-msgid "Unknown error."
-msgstr ""
-
-#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243 src/net/eathena/loginhandler.cpp:180
+#: src/net/ea/loginhandler.cpp:207 src/net/eathena/loginhandler.cpp:173
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247 src/net/eathena/loginhandler.cpp:184
+#: src/net/ea/loginhandler.cpp:211 src/net/eathena/loginhandler.cpp:177
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252 src/net/eathena/loginhandler.cpp:189
+#: src/net/ea/loginhandler.cpp:216 src/net/eathena/loginhandler.cpp:182
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256 src/net/eathena/loginhandler.cpp:193
+#: src/net/ea/loginhandler.cpp:220 src/net/eathena/loginhandler.cpp:186
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260 src/net/eathena/loginhandler.cpp:197
+#: src/net/ea/loginhandler.cpp:224 src/net/eathena/loginhandler.cpp:190
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265 src/net/eathena/loginhandler.cpp:202
+#: src/net/ea/loginhandler.cpp:229 src/net/eathena/loginhandler.cpp:195
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:269 src/net/eathena/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:233 src/net/eathena/loginhandler.cpp:199
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7724,26 +7757,32 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:239 src/net/eathena/loginhandler.cpp:208
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:279 src/net/eathena/loginhandler.cpp:220
+#: src/net/ea/loginhandler.cpp:243 src/net/eathena/loginhandler.cpp:213
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:230
+#: src/net/ea/loginhandler.cpp:251 src/net/eathena/loginhandler.cpp:223
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:291 src/net/eathena/loginhandler.cpp:235
+#: src/net/ea/loginhandler.cpp:255 src/net/eathena/loginhandler.cpp:228
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:232
+#: src/net/tmwa/loginhandler.cpp:286
+msgid "Unknown error."
+msgstr ""
+
+#. TRANSLATORS: error message
 #: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr ""
@@ -7759,27 +7798,27 @@ msgid "Connection to server terminated. "
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:523
-#: src/net/eathena/charserverhandler.cpp:560
+#: src/net/eathena/charserverhandler.cpp:524
+#: src/net/eathena/charserverhandler.cpp:561
 msgid "Character rename error."
 msgstr ""
 
-#: src/net/eathena/charserverhandler.cpp:538
+#: src/net/eathena/charserverhandler.cpp:539
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:551
+#: src/net/eathena/charserverhandler.cpp:552
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:555
+#: src/net/eathena/charserverhandler.cpp:556
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:564
+#: src/net/eathena/charserverhandler.cpp:565
 msgid "Character not found."
 msgstr ""
 
@@ -7816,256 +7855,256 @@ msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:126
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:128
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:128
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:130
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:132
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:134
+#: src/net/eathena/generalhandler.cpp:134 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:136
+#: src/net/eathena/generalhandler.cpp:135 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:168 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:170 src/net/tmwa/generalhandler.cpp:173
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:175
+#: src/net/eathena/generalhandler.cpp:173 src/net/tmwa/generalhandler.cpp:177
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
+#: src/net/eathena/generalhandler.cpp:178 src/net/tmwa/generalhandler.cpp:183
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:181 src/net/tmwa/generalhandler.cpp:187
+#: src/net/eathena/generalhandler.cpp:183 src/net/tmwa/generalhandler.cpp:189
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:192
+#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:194
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:188
+#: src/net/eathena/generalhandler.cpp:190
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:191
+#: src/net/eathena/generalhandler.cpp:193
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:194 src/net/tmwa/generalhandler.cpp:196
+#: src/net/eathena/generalhandler.cpp:196 src/net/tmwa/generalhandler.cpp:198
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:197
+#: src/net/eathena/generalhandler.cpp:199
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:200
+#: src/net/eathena/generalhandler.cpp:202
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:203
+#: src/net/eathena/generalhandler.cpp:205
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:206
+#: src/net/eathena/generalhandler.cpp:208
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:209
+#: src/net/eathena/generalhandler.cpp:211
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:212
+#: src/net/eathena/generalhandler.cpp:214
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:215
+#: src/net/eathena/generalhandler.cpp:217
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219
+#: src/net/eathena/generalhandler.cpp:221
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:222
+#: src/net/eathena/generalhandler.cpp:224
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:225
+#: src/net/eathena/generalhandler.cpp:227
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:228
+#: src/net/eathena/generalhandler.cpp:230
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:231
+#: src/net/eathena/generalhandler.cpp:233
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:235
+#: src/net/eathena/generalhandler.cpp:237
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:238
+#: src/net/eathena/generalhandler.cpp:240
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:241
+#: src/net/eathena/generalhandler.cpp:243
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:244
+#: src/net/eathena/generalhandler.cpp:246
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:247
+#: src/net/eathena/generalhandler.cpp:249
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:250
+#: src/net/eathena/generalhandler.cpp:252
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:255
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:200
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:202
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:266
+#: src/net/eathena/generalhandler.cpp:268
 msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:342 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:345 src/net/tmwa/generalhandler.cpp:288
 msgid "Got disconnected from server!"
 msgstr "Disconnected from server!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:370 src/net/tmwa/generalhandler.cpp:316
 msgid "Strength"
 msgstr "Strength"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:371 src/net/tmwa/generalhandler.cpp:318
 msgid "Agility"
 msgstr "Agility"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:372 src/net/tmwa/generalhandler.cpp:320
 msgid "Vitality"
 msgstr "Vitality"
 
-#: src/net/eathena/generalhandler.cpp:371 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:374 src/net/tmwa/generalhandler.cpp:323
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:372 src/net/tmwa/generalhandler.cpp:322
+#: src/net/eathena/generalhandler.cpp:375 src/net/tmwa/generalhandler.cpp:325
 msgid "Dexterity"
 msgstr "Dexterity"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:373 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:376 src/net/tmwa/generalhandler.cpp:327
 msgid "Luck"
 msgstr "Luck"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:376 src/net/tmwa/generalhandler.cpp:328
+#: src/net/eathena/generalhandler.cpp:379 src/net/tmwa/generalhandler.cpp:331
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:377 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:380 src/net/tmwa/generalhandler.cpp:333
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:378 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:381 src/net/tmwa/generalhandler.cpp:335
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:380 src/net/tmwa/generalhandler.cpp:335
+#: src/net/eathena/generalhandler.cpp:383 src/net/tmwa/generalhandler.cpp:338
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:382 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:385 src/net/tmwa/generalhandler.cpp:341
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:341
+#: src/net/eathena/generalhandler.cpp:387 src/net/tmwa/generalhandler.cpp:344
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:385 src/net/tmwa/generalhandler.cpp:343
+#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:346
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
+#: src/net/eathena/generalhandler.cpp:389 src/net/tmwa/generalhandler.cpp:348
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:387 src/net/tmwa/generalhandler.cpp:347
+#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:350
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:349
+#: src/net/eathena/generalhandler.cpp:391 src/net/tmwa/generalhandler.cpp:352
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:389
+#: src/net/eathena/generalhandler.cpp:392
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:390
+#: src/net/eathena/generalhandler.cpp:393
 msgid "Manner"
 msgstr ""
 
@@ -8130,13 +8169,13 @@ msgid "Huh? What's that?"
 msgstr ""
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:87
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
 #. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:188
+#: src/net/ea/tradehandler.cpp:175
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s wants to trade with you, do you accept?"
@@ -8172,6 +8211,21 @@ msgid "Luck:"
 msgstr ""
 
 #. TRANSLATORS: error message
+#: src/net/tmwa/loginhandler.cpp:274
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/loginhandler.cpp:278
+msgid "Old password incorrect."
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/loginhandler.cpp:282
+msgid "New password too short."
+msgstr ""
+
+#. TRANSLATORS: error message
 #: src/net/tmwa/skillhandler.cpp:190
 msgid "Trade failed!"
 msgstr ""