Update translations.

author: Andrei Karas <akaras@inbox.ru> 2014-12-29 20:11:23 +0300
committer: Andrei Karas <akaras@inbox.ru> 2014-12-29 20:11:23 +0300
commit: 57a6a4ab0fe9143e1cd3b566e5e9a7da1cee2429 (patch)
tree: 9b057c46893e5b50613c22efdde8bbf008ebcbd6 /po
parent: ce2bd403c4d9297768d67ec615c2748fe4674333 (diff)
download: mv-57a6a4ab0fe9143e1cd3b566e5e9a7da1cee2429.tar.gz
mv-57a6a4ab0fe9143e1cd3b566e5e9a7da1cee2429.tar.bz2
mv-57a6a4ab0fe9143e1cd3b566e5e9a7da1cee2429.tar.xz
mv-57a6a4ab0fe9143e1cd3b566e5e9a7da1cee2429.zip
39 files changed, 20569 insertions, 10846 deletions
diff --git a/po/LINGUAS b/po/LINGUAS
index 602264189..b5e67ac0b 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,7 +1,7 @@
 # Set of available languages.
 #ar # Disabled because of current client limitations (shaping, RTL)
 #bg # Not enough translations
-#ca # Not enough translations
+ca
 cs
 #da # Not enough translations
 de
@@ -21,7 +21,7 @@ ja
 #ka # Not enough translations
 #nb # Not enough translations
 #nds # Not enough translations
-#nl # Not enough translations
+nl
 nl_BE
 pl
 pt
@@ -29,12 +29,12 @@ pt_BR
 ru
 #sk # Not enough translations
 #sq # Not enough translations
-#sv # Not enough translations
+sv
 sv_SE
 #te # Disabled because of current client limitations (font fallbacking)
 #th # Disabled because of current client limitations (font fallbacking)
 tr
-#uk # Not enough translations
+uk
 zh_CN
 #zh_HK # Disabled because of current client limitations (font fallbacking)
 #zh_TW # Disabled because of current client limitations (font fallbacking)
diff --git a/po/ar.po b/po/ar.po
index 3dc77aa61..5a2b4bc27 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-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: Arabic (http://www.transifex.com/projects/p/manaplus/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:131
+#: src/actions/actions.cpp:139
 msgid "File uploaded"
 msgstr ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr ""
 
 #. 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 ""
 
@@ -421,8 +424,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 ""
 
@@ -496,9 +499,9 @@ msgstr ""
 #. 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"
@@ -549,14 +552,14 @@ msgstr ""
 #: 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 "خطأ"
 
@@ -1053,7 +1056,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 ""
 
@@ -1237,8 +1240,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 ""
 
@@ -1489,7 +1492,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 ""
 
@@ -1512,23 +1515,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
@@ -1549,7 +1552,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 ""
@@ -1564,54 +1567,50 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
@@ -1629,9 +1628,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 ""
@@ -1640,7 +1639,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 ""
@@ -1652,9 +1651,9 @@ msgstr ""
 #. 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 "شراء"
@@ -1667,7 +1666,7 @@ msgstr "شراء"
 #. 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
@@ -1678,26 +1677,26 @@ msgstr "بيع"
 #. 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 ""
 
@@ -1705,19 +1704,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 ""
 
@@ -1725,19 +1724,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 ""
 
@@ -1745,8 +1744,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
@@ -1758,7 +1757,7 @@ msgstr "تجريد من العتاد"
 
 #. 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 ""
 
@@ -1766,44 +1765,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 ""
 
 #. 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 ""
 
@@ -1813,20 +1812,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 ""
 
@@ -1835,77 +1834,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 ""
 
@@ -1915,79 +1914,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 ""
 
@@ -1996,64 +1987,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 ""
 
-#. 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 ""
 
-#. 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 ""
 
@@ -2063,9 +2038,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
@@ -2073,41 +2048,41 @@ msgid "Use"
 msgstr "استخدام"
 
 #. 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 ""
 
@@ -2115,155 +2090,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 ""
 
@@ -2271,50 +2246,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 "إسقاط"
 
 #. 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 "قسم"
-
-#. 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 ""
 
@@ -2362,8 +2330,9 @@ msgstr ""
 #: 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 ""
 
@@ -2601,7 +2570,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"
@@ -2623,7 +2592,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
@@ -2636,7 +2605,7 @@ msgstr "مغادرة"
 #. 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
@@ -2649,7 +2618,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
@@ -2661,7 +2630,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"
@@ -2669,8 +2638,8 @@ msgstr ""
 
 #. 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 ""
@@ -3862,7 +3831,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 ""
 
@@ -3991,7 +3960,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 ""
 
@@ -4918,7 +4887,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 "العتاد"
 
@@ -4929,8 +4898,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 "الجردة"
 
@@ -5071,19 +5040,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"
@@ -5171,7 +5140,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 ""
 
@@ -5179,7 +5148,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:"
@@ -5189,11 +5158,11 @@ 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: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 ""
@@ -5202,72 +5171,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 ""
 
 #. 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 ""
 
 #. 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 "رجاء أن توزّع %d نقطة"
 
 #. 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 "يجب أن يكون طول اسمك على الأقل 4 محارف."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "إحصائيات الشخصيّة جيّدة"
 
 #. 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 "رجاء حذف %d نقطة"
@@ -5310,8 +5279,8 @@ msgstr ""
 #. 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 ""
 
@@ -5380,7 +5349,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. 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 ""
@@ -5497,7 +5466,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
@@ -5508,6 +5477,11 @@ msgstr ""
 msgid "Equip"
 msgstr "استعمال العتاد"
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr "قسم"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -6000,11 +5974,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 ""
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6053,111 +6027,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr ""
 
-#: 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 ""
 
@@ -6306,12 +6280,12 @@ msgid "You give:"
 msgstr "أنت تقدّم:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr ""
 
 #. 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 ""
@@ -6332,27 +6306,27 @@ msgstr ""
 msgid "Connecting..."
 msgstr "جارِ الاتّصال..."
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6753,22 +6727,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6828,18 +6802,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
@@ -6862,286 +6874,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"
+msgid "Input ignore"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
+msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
+msgid "Ignore input 2"
 msgstr ""
 
 #. 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 ""
@@ -7396,12 +7450,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 ""
 
@@ -7556,8 +7610,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 ""
 
@@ -7675,59 +7729,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"
@@ -7735,26 +7768,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 ""
@@ -7770,27 +7809,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 ""
 
@@ -7827,256 +7866,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -8141,13 +8180,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 ""
@@ -8183,6 +8222,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 ""
diff --git a/po/bg.po b/po/bg.po
index 78c336cba..745a22648 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-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: Bulgarian (http://www.transifex.com/projects/p/manaplus/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,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 ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr ""
 
 #. 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 ""
 
@@ -417,8 +420,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 ""
 
@@ -492,9 +495,9 @@ msgstr ""
 #. 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"
@@ -545,14 +548,14 @@ msgstr ""
 #: 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 ""
 
@@ -1049,7 +1052,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 ""
 
@@ -1233,8 +1236,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 ""
 
@@ -1485,7 +1488,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 ""
 
@@ -1508,23 +1511,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
@@ -1545,7 +1548,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 ""
@@ -1560,54 +1563,50 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
@@ -1625,9 +1624,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 ""
@@ -1636,7 +1635,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 ""
@@ -1648,9 +1647,9 @@ msgstr ""
 #. 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 ""
@@ -1663,7 +1662,7 @@ msgstr ""
 #. 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
@@ -1674,26 +1673,26 @@ msgstr ""
 #. 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 ""
 
@@ -1701,19 +1700,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 ""
 
@@ -1721,19 +1720,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 ""
 
@@ -1741,8 +1740,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
@@ -1754,7 +1753,7 @@ msgstr ""
 
 #. 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 ""
 
@@ -1762,44 +1761,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 ""
 
 #. 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 ""
 
@@ -1809,20 +1808,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 ""
 
@@ -1831,77 +1830,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 ""
 
@@ -1911,79 +1910,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 ""
 
@@ -1992,64 +1983,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 ""
 
-#. 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 ""
 
-#. 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 ""
 
@@ -2059,9 +2034,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
@@ -2069,41 +2044,41 @@ msgid "Use"
 msgstr ""
 
 #. 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 ""
 
@@ -2111,155 +2086,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 ""
 
@@ -2267,50 +2242,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 ""
 
 #. 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 ""
-
-#. 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 ""
 
@@ -2358,8 +2326,9 @@ msgstr ""
 #: 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 ""
 
@@ -2597,7 +2566,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"
@@ -2619,7 +2588,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
@@ -2632,7 +2601,7 @@ msgstr ""
 #. 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
@@ -2645,7 +2614,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
@@ -2657,7 +2626,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"
@@ -2665,8 +2634,8 @@ msgstr ""
 
 #. 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 ""
@@ -3858,7 +3827,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 ""
 
@@ -3987,7 +3956,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 ""
 
@@ -4914,7 +4883,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 ""
 
@@ -4925,8 +4894,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 ""
 
@@ -5067,19 +5036,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"
@@ -5167,7 +5136,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 ""
 
@@ -5175,7 +5144,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:"
@@ -5185,11 +5154,11 @@ 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: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 ""
@@ -5198,72 +5167,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr ""
 
 #. 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 ""
@@ -5306,8 +5275,8 @@ msgstr ""
 #. 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 ""
 
@@ -5376,7 +5345,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. 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 ""
@@ -5493,7 +5462,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
@@ -5504,6 +5473,11 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5988,11 +5962,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 ""
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6041,111 +6015,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr ""
 
-#: 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 ""
 
@@ -6294,12 +6268,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr ""
 
 #. 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 ""
@@ -6320,27 +6294,27 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6741,22 +6715,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6816,18 +6790,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
@@ -6850,286 +6862,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"
+msgid "Input ignore"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
+msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
+msgid "Ignore input 2"
 msgstr ""
 
 #. 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 ""
@@ -7384,12 +7438,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 ""
 
@@ -7544,8 +7598,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 ""
 
@@ -7663,59 +7717,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"
@@ -7723,26 +7756,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 ""
@@ -7758,27 +7797,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 ""
 
@@ -7815,256 +7854,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -8129,13 +8168,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 ""
@@ -8171,6 +8210,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 ""
diff --git a/po/ca.po b/po/ca.po
index 425e0090e..597be7329 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-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: Catalan (http://www.transifex.com/projects/p/manaplus/language/ca/)\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 "Temps d'activitat del client: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:889
+#: src/actions/actions.cpp:1041
 #, c-format
 msgid "%d week"
 msgstr "setmana %d"
 
-#: 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 "Dia %d"
 
-#: 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 "Hora %d"
 
-#: 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 "Minut %d"
 
-#: 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 "Segon  %d"
 
-#: 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 "No es poden enviar xiuxiueigs  buits!"
 
 #. 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 "Falta el nom del grup."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:333
 msgid "Guild name is missing."
 msgstr "Falta el nom del gremi."
 
 #. 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 "Si us plau especifica un nom."
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Return toggles chat."
 msgstr "Tornar a alternar el xat."
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr "Missatge tanca el xat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr "Torna ara a canviar el xat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr "Missatge ara tanca el xat."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:107
+#: src/actions/commands.cpp:114
 #, c-format
 msgid "Player already %s!"
 msgstr "El jugador ja és %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:119
+#: src/actions/commands.cpp:127
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Relació canviada amb èxit, el jugador es ara %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:129
 #, c-format
 msgid "Player could not be %s!"
 msgstr "El jugador no pot ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:160
 msgid "Player wasn't ignored!"
 msgstr "El jugador no estava ignorat!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:161
+#: src/actions/commands.cpp:169
 msgid "Player no longer ignored!"
 msgstr "El jugador ja no està ignorat!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:171
 msgid "Player could not be unignored!"
 msgstr "El jugador no pot ser des-ignorat!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:178
+#: src/actions/commands.cpp:186
 msgid "Player already erased!"
 msgstr "Personatge ja esborrat!"
 
 #. 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 "El personatge no pot ser esborrat!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:200
+#: src/actions/commands.cpp:208
 msgid "friend"
 msgstr "amic"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:215
 msgid "disregarded"
 msgstr "desatès"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:214
+#: src/actions/commands.cpp:222
 msgid "neutral"
 msgstr "neutral"
 
 #. 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 "Visible al mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:394
+#: src/being/being.cpp:395
 msgid "Human"
 msgstr "Humà"
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "dodge"
 msgstr "esquiva"
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr "falla"
 
 #. 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 "A"
 
 #. 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 "I"
 
@@ -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 "Ignorar completament"
 
@@ -493,9 +496,9 @@ msgstr "Ajuda"
 #. 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 "Canviant servidors de joc"
 #: 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 "Crear grup"
 
@@ -1509,23 +1512,23 @@ 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: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 "Pes: %s"
 #. 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 "Intercanvi"
@@ -1561,54 +1564,50 @@ msgstr "Intercanvi"
 #. 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 "Atacar"
 
 #. 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 "Moure"
@@ -1637,7 +1636,7 @@ msgstr "Moure"
 #. 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 "Parlar"
@@ -1649,9 +1648,9 @@ msgstr "Parlar"
 #. 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 "Comprar"
@@ -1664,7 +1663,7 @@ msgstr "Comprar"
 #. 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 "Vendre"
 #. 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 "Des-equipar"
 
 #. 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 "Jugadors"
 
 #. 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 "Afegir al xat"
 
 #. 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 "Element del mapa"
 
 #. 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 "Conjunt"
 
 #. 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 "Conjurs"
 
 #. 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 "Netejar"
 
 #. 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 "Desactivar ressaltat"
 
 #. 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 "Activa resaltat"
 
 #. 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 "Borrar nom"
 
 #. 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 "Habilitar absència"
 
 #. 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 "Des-habilita absència"
 
 #. 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 "Deixa"
 
@@ -1912,79 +1911,71 @@ msgstr "Deixa"
 #. 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 "Canviar la posició del gremi"
 
 #. 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 "Canviar el nom de la marca de mapa "
 
 #. 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 "Nom:                     "
 
-#: 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 "Afegeix al intercanvi"
 
-#. 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 "Agregar-ne 10 al intercanvi"
 
-#. 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 "Agregar-ne la mitat al intercanvi"
 
-#. 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 "Agregar-los tots al intercanvi"
 
@@ -1993,64 +1984,48 @@ msgstr "Agregar-los tots al intercanvi"
 #. 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 "Botiga"
 
-#. 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 "Emmagatzema 10"
 
-#. 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 "Emmagatzema la mitat"
 
-#. 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 "Emmagatzema-ho tot"
 
 #. 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 "Recuperar"
 
-#. 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 "Recupera 10"
 
-#. 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 "Recuperar la mitat"
 
-#. 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 "Recupera-ho tot"
 
@@ -2060,9 +2035,9 @@ msgstr "Recupera-ho tot"
 #. 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 "Utilitzar"
 
 #. 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 "Amagar"
 
 #. 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 "Mostrar"
 
 #. 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 "Ignorar"
 
 #. 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 "Deixar caure..."
 
 #. 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 "Deixar caure"
 
 #. 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 "Dividir"
-
-#. 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 "Xat"
 #: 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 "Sortir"
 #. 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 "Preu: %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 "Botiga"
 
@@ -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 "EQU"
 #. 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 "Equipament"
 
@@ -4926,8 +4895,8 @@ msgstr "INV"
 
 #. 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 "Inventari"
 
@@ -5068,19 +5037,19 @@ msgid "Result"
 msgstr "Resultat"
 
 #. 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 "Les noves contrasenyes no coincideixen."
 
 #. 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 "Nom:"
 #. 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 "Color de cabells:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Pentinat:"
 
 #. 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 "Home"
 
 #. 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 "Dona"
 
 #. 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 "Distribueix %d punts"
 
 #. 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 "El nom ha de tenir com a mínim 4 caràcters."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Estadístiques de personatge correctes"
 
 #. 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 "Has de treure %d punts"
@@ -5307,8 +5276,8 @@ msgstr "Juga"
 #. 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 "Informació"
 
@@ -5377,7 +5346,7 @@ msgid "Whispering to %s: %s"
 msgstr "Xiuxiuejant a %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 "Equipar"
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr "Dividir"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5989,11 +5963,11 @@ msgstr "Mostra enllaços al anunci"
 
 #. 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 "Petició d'intercanvi"
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s vol %s %s acceptes?"
@@ -6042,111 +6016,111 @@ msgid "Invite"
 msgstr "Invita"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Acceptada invitació a grup de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Refusada invitació al grup de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Acceptada invitació a gremi de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Refusada invitació al gremi de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Creant gremi anomenat %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Creant grup anomenat %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Nom de gremi"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Selecciona nom del gremi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Invitació al grup rebuda, però ja n'hi ha una existent."
 
 #. 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 "%s t'ha invitat al gremi %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Acceptar invitació a gremi"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Rebuda invitació a grup, però ja n'hi ha una d'existent."
 
 #. 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 "Has estat invitat a unir-te a un grup."
 
 #. 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 "Has estat invitat a unir-te al grup %s."
 
 #. 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 t'ha invitat a unir-te al seu grup."
 
 #. 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 t'ha invitat a unir-te al grup %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Acceptar invitació a grup"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:503
 msgid "Cannot create party. You are already in a party"
 msgstr "No es pot crear grup. Ja en pertanys a un."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Party Name"
 msgstr "Nom del grup"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:514
 msgid "Choose your party's name."
 msgstr "Tria el nom del teu grup."
 
@@ -6295,12 +6269,12 @@ msgid "You give:"
 msgstr "Ofereixes:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr "No tens diners suficients."
 
 #. 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 "No s'ha pogut afegir objecte. No es pot afegir més d'un mateix tipus d'objecte a la finestra."
@@ -6321,27 +6295,27 @@ msgstr "Actualitzant..."
 msgid "Connecting..."
 msgstr "Connectant..."
 
-#: 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 El procés d'actualització està incomplet."
 
 #. 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 Això es altament recomanat"
 
 #. 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 "##1 tornes a provar més tard."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1019
+#: src/gui/windows/updaterwindow.cpp:1020
 msgid "Completed"
 msgstr "Complet"
 
@@ -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 "Mou Amunt"
 
 #. 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 "Mou Abaix"
 
 #. 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 "Mou Esquerra"
 
 #. 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 "Mou Dreta"
 
@@ -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 "Ignora entrada 1"
+msgid "Input ignore"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
-msgstr "Ignora entrada 2"
+msgid "Ignore input 1"
+msgstr "Ignora entrada 1"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
-msgstr "Mira amunt"
+msgid "Ignore input 2"
+msgstr "Ignora entrada 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-msgid "Direct Down"
-msgstr "Mira abaix"
+msgid "Direction keys"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
-msgid "Direct Left"
-msgstr "Mira esquerra"
+msgid "Player direct up"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-msgid "Direct Right"
-msgstr "Mira dreta"
+msgid "Player direct down"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
+msgid "Player direct left"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:78
+msgid "Player direct right"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:84
+msgid "Pet direct up"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:90
+msgid "Pet direct down"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:96
+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 "Moviments boigs"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:78
+#: src/input/pages/other.cpp:120
 msgid "Change Crazy Move mode"
 msgstr "Canvia tipus de moviment boig"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:84
+#: src/input/pages/other.cpp:126
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Aboca ràpidament objectes N de la ranura 0"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:90
+#: src/input/pages/other.cpp:132
 msgid "Quick Drop N Items"
 msgstr "Aboca ràpidament objectes N"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:96
+#: src/input/pages/other.cpp:138
 msgid "Switch Quick Drop Counter"
 msgstr "Selecciona contador d'abocament"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:102
+#: src/input/pages/other.cpp:144
 msgid "Quick heal target or self"
 msgstr "Cura ràpidament l'objectiu o un mateix"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:108
+#: src/input/pages/other.cpp:150
 msgid "Use #itenplz spell"
 msgstr "Utilitza el conjur #itenplz"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:114
+#: src/input/pages/other.cpp:156
 msgid "Use magic attack"
 msgstr "Utilitza atac màgic"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:120
+#: src/input/pages/other.cpp:162
 msgid "Switch magic attack"
 msgstr "Selecciona atac màgic"
 
 #. 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 "Canvia tipus de moviment"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:138
+#: src/input/pages/other.cpp:180
 msgid "Change Attack Weapon Type"
 msgstr "Canvia tipus d'atac d'arma"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:144
+#: src/input/pages/other.cpp:186
 msgid "Change Attack Type"
 msgstr "Canvia tipus d'atac"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:150
+#: src/input/pages/other.cpp:192
 msgid "Change Follow mode"
 msgstr "Canvia tipus de seguiment"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:156
+#: src/input/pages/other.cpp:198
 msgid "Change Imitation mode"
 msgstr "Canvia mode d'imitació"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:162
+#: src/input/pages/other.cpp:204
 msgid "Disable / Enable Game modifier keys"
 msgstr "Activa/Desactiva tecles de modificació de joc"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:168
+#: src/input/pages/other.cpp:210
 msgid "On / Off audio"
 msgstr "Àudio On / Off"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:174
+#: src/input/pages/other.cpp:216
 msgid "Enable / Disable away mode"
 msgstr "Activa / Desactiva mode AFK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:180
+#: src/input/pages/other.cpp:222
 msgid "Emulate right click from keyboard"
 msgstr "Emular clic dret des de teclat"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:186
+#: src/input/pages/other.cpp:228
 msgid "Toggle camera mode"
 msgstr "Selecciona mode de càmera"
 
 #. 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 "Emmagatzematge"
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:307
+#: src/inventory.cpp:309
 msgid "Cart"
 msgstr "Motxilla"
 
@@ -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 "Antiga contrasenya incorrecta."
-
-#. 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 "Error desconegut."
-
-#. 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 "Error desconegut."
+
+#. TRANSLATORS: error message
 #: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr "Direcció buida enviada a Network::connect()!"
@@ -7759,27 +7798,27 @@ msgid "Connection to server terminated. "
 msgstr "Connexió interrompuda amb el servidor. "
 
 #. 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 "Autenticació fallida."
 
 #. 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 "No hi ha cap servidor disponible."
 
 #. 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 "Algú altre està provant d'utilitzar aquest compte."
 
 #. 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 "Aquest compte ja està sent utilitzat."
 
 #. 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 "Hack de desplaçament ràpid detectat."
 
-#: 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 "Accès de sessió duplicat."
 
-#: 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 "Error de connexió desconegut."
 
-#: 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 "Has estat desconnectat del servidor!"
 
 #. 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 "Força"
 
 #. 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 "Agilitat"
 
 #. 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 "Vitalitat"
 
-#: 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 "Intel·ligència"
 
 #. 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 "Destresa"
 
 #. 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 "Sort"
 
 #. 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 "Defensa"
 
 #. 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 "Atac màgic"
 
 #. 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 "Defensa màgica"
 
 #. 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 "% de Precisió"
 
 #. 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 "% de Evasió"
 
 #. 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 "% de Crític"
 
 #. 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 "Retard d'atac"
 
 #. 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 "Demora a peu"
 
 #. 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 "Distància d'atac"
 
 #. 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 bol un intercanvi amb tu, acceptes?"
@@ -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 "Antiga contrasenya incorrecta."
+
+#. 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 ""
diff --git a/po/cs.po b/po/cs.po
index ef9c9aa0e..ca7d08edb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-20 14:14+0000\n"
+"PO-Revision-Date: 2014-12-29 09:57+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
 "cs/)\n"
@@ -6817,57 +6817,48 @@ msgstr "Pohybové klávesy"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "Zobrazovat bubliny hráčů"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "Posunout dolů"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "Pohyb vlevo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "Pohyb vpravo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
-#, fuzzy
 msgid "Move player forward"
-msgstr "Pohyb vpřed"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "Posunout nahoru"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "Posunout dolů"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "Pohyb vlevo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "Pohyb vpravo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6905,9 +6896,8 @@ msgstr "Zkratka přesunu k bodu %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "Odignorovat"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6921,9 +6911,8 @@ msgstr "Ignorovat vstup 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "Otočit dolů"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6932,45 +6921,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "Hráč zasáhl monstrum"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "Otočit vlevo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "Otočit vpravo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "Otočit nahoru"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "Otočit dolů"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "Otočit vlevo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "Otočit vpravo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7221,9 +7203,8 @@ msgstr "Zastřel svého žoldáka"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "Reset statistik"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/de.po b/po/de.po
index 1f750f6db..7ee381d45 100644
--- a/po/de.po
+++ b/po/de.po
@@ -30,7 +30,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-11 10:00+0000\n"
+"PO-Revision-Date: 2014-12-29 09:57+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
 "de/)\n"
@@ -6828,57 +6828,48 @@ msgstr "Bewegungstasten"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "Zeige Spieler-Popups"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "Nach unten"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "Laufe nach Links"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "Laufe nach Rechts"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
-#, fuzzy
 msgid "Move player forward"
-msgstr "Bewege Kamera"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "Nach oben"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "Nach unten"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "Laufe nach Links"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "Laufe nach Rechts"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6916,9 +6907,8 @@ msgstr "Kurzbefehl Bewegung zu Punkt %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "Nicht mehr Ignorieren"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6932,9 +6922,8 @@ msgstr "Ignoriere Eingabe 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "Richtung unten"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6943,45 +6932,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "Spielerposition:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "Richtung links"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "Richtung rechts"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "Richtung oben"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "Richtung unten"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "Richtung links"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "Richtung rechts"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7230,9 +7212,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "Statistik zurücksetzen"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
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 ""
diff --git a/po/eo.po b/po/eo.po
index a7f5b931f..c9159dc76 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-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: Esperanto (http://www.transifex.com/projects/p/manaplus/language/eo/)\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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr ""
 
 #. 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 "amiko"
 
 #. 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 "malamiko"
 
@@ -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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 "A"
 
 #. 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 "I"
 
@@ -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 "Helpo"
 #. 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 ""
 #: 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 "Eraro"
 
@@ -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 "Krei partion"
 
@@ -1509,23 +1512,23 @@ 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: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 ""
@@ -1561,54 +1564,50 @@ msgstr ""
 #. 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 ""
 
 #. 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 "Sanigi"
 
 #. 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 "Movi"
@@ -1637,7 +1636,7 @@ msgstr "Movi"
 #. 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 "Paroli"
@@ -1649,9 +1648,9 @@ msgstr "Paroli"
 #. 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 ""
@@ -1664,7 +1663,7 @@ msgstr ""
 #. 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 ""
 #. 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 ""
 
 #. 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 "Ludantoj"
 
 #. 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 "Forlasi"
 
@@ -1912,79 +1911,71 @@ msgstr "Forlasi"
 #. 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 "Nomo:                    "
 
-#: 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 ""
 
-#. 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 ""
 
-#. 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 "Uzi"
 
 #. 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 "Ignori"
 
 #. 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 "Forigi"
 
 #. 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 "Malignori"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2351
 msgid "Follow"
 msgstr "Sekvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Imitation"
 msgstr "Imitado"
 
 #. 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 ""
 
 #. 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 ""
-
-#. 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 "Babilado"
 #: 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 "Alia"
 
@@ -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 "Eliri"
 #. 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 ""
 
 #. 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 ""
@@ -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 ""
 
@@ -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 ""
 
@@ -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 ""
 
@@ -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 "Kvanto:"
 
 #. 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 "Nomo:"
 #. 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 "Har-koloro:"
 
 #. 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 "Iĉa"
 
 #. 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 "Ina"
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr ""
 
 #. 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 ""
@@ -5307,8 +5276,8 @@ msgstr "Ludi"
 #. 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 ""
 
@@ -5377,7 +5346,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. 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 ""
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr ""
+
 #. 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr ""
 
-#: 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 "Partio-nomo"
 
 #. 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 "Vi donas:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr ""
 
 #. 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 ""
@@ -6321,27 +6295,27 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -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 "Movi supren"
 
 #. 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 "Movi malsupren"
 
 #. 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 "Movi maldekstren"
 
 #. 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 "Movi dekstren"
 
@@ -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"
+msgid "Input ignore"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
+msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
+msgid "Ignore input 2"
 msgstr ""
 
 #. 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 "Nekorekta nomo."
 
@@ -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 "Nekonata eraro."
-
-#. 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 "Nekonata eraro."
+
+#. 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 ""
 
 #. 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 "Forto"
 
 #. 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 "Rapideco"
 
 #. 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 ""
 
-#: 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 "Lerteco"
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
@@ -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 ""
diff --git a/po/es.po b/po/es.po
index fbbed59ee..b8dfff6e7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,8 +22,8 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-20 19:56+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
+"PO-Revision-Date: 2014-12-29 09:57+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
 "language/es/)\n"
 "Language: es\n"
@@ -6836,57 +6836,48 @@ msgstr "Teclas de movimiento"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "Mostrar las ventanas emergentes de jugadores"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "Bajar"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "Moverse a la izquierda"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "Moverse a la derecha"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
-#, fuzzy
 msgid "Move player forward"
-msgstr "Muévase adelante"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "Subir"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "Bajar"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "Moverse a la izquierda"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "Moverse a la derecha"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6924,9 +6915,8 @@ msgstr "Moverse a punto de atajo %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "Dejar de ignorar"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6940,9 +6930,8 @@ msgstr "Ignorar input 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "Mirar hacia abajo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6951,45 +6940,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "Jugador golpea monstruo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "Mirar a la izquierda"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "Mirar a la derecha"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "Mirar hacia arriba"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "Mirar hacia abajo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "Mirar a la izquierda"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "Mirar a la derecha"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7238,9 +7220,8 @@ msgstr "Disparar con tu mercenario"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "Restablecer estadísticas"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/et.po b/po/et.po
index 2d48ffcb3..5a106f7de 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-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: Estonian (http://www.transifex.com/projects/p/manaplus/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,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 ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr ""
 
 #. 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 ""
 
@@ -417,8 +420,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 ""
 
@@ -492,9 +495,9 @@ msgstr "Abi"
 #. 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"
@@ -545,14 +548,14 @@ msgstr ""
 #: 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 "Viga"
 
@@ -1049,7 +1052,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 ""
 
@@ -1233,8 +1236,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 ""
 
@@ -1485,7 +1488,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 ""
 
@@ -1508,23 +1511,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
@@ -1545,7 +1548,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 ""
@@ -1560,54 +1563,50 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
@@ -1625,9 +1624,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 ""
@@ -1636,7 +1635,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 ""
@@ -1648,9 +1647,9 @@ msgstr ""
 #. 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 ""
@@ -1663,7 +1662,7 @@ msgstr ""
 #. 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
@@ -1674,26 +1673,26 @@ msgstr ""
 #. 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 ""
 
@@ -1701,19 +1700,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 ""
 
@@ -1721,19 +1720,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 ""
 
@@ -1741,8 +1740,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
@@ -1754,7 +1753,7 @@ msgstr ""
 
 #. 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 ""
 
@@ -1762,44 +1761,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 ""
 
 #. 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 ""
 
@@ -1809,20 +1808,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 ""
 
@@ -1831,77 +1830,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 ""
 
@@ -1911,79 +1910,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 ""
 
@@ -1992,64 +1983,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 ""
 
-#. 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 ""
 
-#. 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 ""
 
@@ -2059,9 +2034,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
@@ -2069,41 +2044,41 @@ msgid "Use"
 msgstr ""
 
 #. 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 ""
 
@@ -2111,155 +2086,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 ""
 
@@ -2267,50 +2242,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 ""
 
 #. 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 ""
-
-#. 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 ""
 
@@ -2358,8 +2326,9 @@ msgstr "Vestlus"
 #: 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 ""
 
@@ -2597,7 +2566,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"
@@ -2619,7 +2588,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
@@ -2632,7 +2601,7 @@ msgstr ""
 #. 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
@@ -2645,7 +2614,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
@@ -2657,7 +2626,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"
@@ -2665,8 +2634,8 @@ msgstr ""
 
 #. 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 ""
@@ -3858,7 +3827,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 ""
 
@@ -3987,7 +3956,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 ""
 
@@ -4914,7 +4883,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 ""
 
@@ -4925,8 +4894,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 ""
 
@@ -5067,19 +5036,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"
@@ -5167,7 +5136,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 ""
 
@@ -5175,7 +5144,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:"
@@ -5185,11 +5154,11 @@ 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: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 ""
@@ -5198,72 +5167,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 "Mees"
 
 #. 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 "Naine"
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr ""
 
 #. 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 ""
@@ -5306,8 +5275,8 @@ msgstr ""
 #. 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 ""
 
@@ -5376,7 +5345,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. 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 ""
@@ -5493,7 +5462,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
@@ -5504,6 +5473,11 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5988,11 +5962,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 ""
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6041,111 +6015,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr ""
 
-#: 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 ""
 
@@ -6294,12 +6268,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr ""
 
 #. 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 ""
@@ -6320,27 +6294,27 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6741,22 +6715,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6816,18 +6790,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
@@ -6850,286 +6862,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"
+msgid "Input ignore"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
+msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
+msgid "Ignore input 2"
 msgstr ""
 
 #. 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 ""
@@ -7384,12 +7438,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 ""
 
@@ -7544,8 +7598,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 ""
 
@@ -7663,59 +7717,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"
@@ -7723,26 +7756,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 ""
@@ -7758,27 +7797,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 ""
 
@@ -7815,256 +7854,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -8129,13 +8168,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 ""
@@ -8171,6 +8210,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 ""
diff --git a/po/fa.po b/po/fa.po
index 1e849044c..94764b96a 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-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: Persian (http://www.transifex.com/projects/p/manaplus/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:131
+#: src/actions/actions.cpp:139
 msgid "File uploaded"
 msgstr ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 "تایید"
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr ""
 
 #. 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 ""
 
@@ -416,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: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 ""
 
@@ -491,9 +494,9 @@ msgstr ""
 #. 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"
@@ -544,14 +547,14 @@ msgstr ""
 #: 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 "خطا"
 
@@ -1048,7 +1051,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 ""
 
@@ -1232,8 +1235,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 ""
 
@@ -1484,7 +1487,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 ""
 
@@ -1507,23 +1510,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
@@ -1544,7 +1547,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 ""
@@ -1559,54 +1562,50 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
@@ -1624,9 +1623,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 ""
@@ -1635,7 +1634,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 ""
@@ -1647,9 +1646,9 @@ msgstr ""
 #. 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 ""
@@ -1662,7 +1661,7 @@ msgstr ""
 #. 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
@@ -1673,26 +1672,26 @@ msgstr ""
 #. 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 ""
 
@@ -1700,19 +1699,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 ""
 
@@ -1720,19 +1719,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 ""
 
@@ -1740,8 +1739,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
@@ -1753,7 +1752,7 @@ msgstr ""
 
 #. 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 ""
 
@@ -1761,44 +1760,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 ""
 
 #. 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 ""
 
@@ -1808,20 +1807,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 ""
 
@@ -1830,77 +1829,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 ""
 
@@ -1910,79 +1909,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 ""
 
@@ -1991,64 +1982,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 ""
 
-#. 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 ""
 
-#. 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 ""
 
@@ -2058,9 +2033,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
@@ -2068,41 +2043,41 @@ msgid "Use"
 msgstr ""
 
 #. 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 ""
 
@@ -2110,155 +2085,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 ""
 
@@ -2266,50 +2241,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 ""
 
 #. 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 ""
-
-#. 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 ""
 
@@ -2357,8 +2325,9 @@ msgstr "چت"
 #: 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 ""
 
@@ -2596,7 +2565,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"
@@ -2618,7 +2587,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
@@ -2631,7 +2600,7 @@ msgstr "خروج"
 #. 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
@@ -2644,7 +2613,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
@@ -2656,7 +2625,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"
@@ -2664,8 +2633,8 @@ msgstr "حداکثر"
 
 #. 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 ""
@@ -3857,7 +3826,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 ""
 
@@ -3986,7 +3955,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 ""
 
@@ -4913,7 +4882,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 "تجهیزات"
 
@@ -4924,8 +4893,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 ""
 
@@ -5066,19 +5035,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"
@@ -5166,7 +5135,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 ""
 
@@ -5174,7 +5143,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:"
@@ -5184,11 +5153,11 @@ 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: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 ""
@@ -5197,72 +5166,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 "مرد"
 
 #. 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 "زن"
 
 #. 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 ""
 
 #. 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 "نام شما حداقل باید 4 کاراکتر داشته باشد."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr ""
 
 #. 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 ""
@@ -5305,8 +5274,8 @@ msgstr ""
 #. 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 ""
 
@@ -5375,7 +5344,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. 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 ""
@@ -5492,7 +5461,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
@@ -5503,6 +5472,11 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5985,11 +5959,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 ""
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6038,111 +6012,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr ""
 
-#: 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 ""
 
@@ -6291,12 +6265,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr ""
 
 #. 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 ""
@@ -6317,27 +6291,27 @@ msgstr ""
 msgid "Connecting..."
 msgstr "در حال اتصال..."
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6738,22 +6712,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6813,18 +6787,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
@@ -6847,286 +6859,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"
+msgid "Input ignore"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
+msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
+msgid "Ignore input 2"
 msgstr ""
 
 #. 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 ""
@@ -7381,12 +7435,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 ""
 
@@ -7541,8 +7595,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 ""
 
@@ -7660,59 +7714,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"
@@ -7720,26 +7753,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 ""
@@ -7755,27 +7794,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 ""
 
@@ -7812,256 +7851,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -8126,13 +8165,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 ""
@@ -8168,6 +8207,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 ""
diff --git a/po/fi.po b/po/fi.po
index b8081d1b1..5567d4c97 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-11 10:00+0000\n"
+"PO-Revision-Date: 2014-12-29 09:57+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
 "language/fi/)\n"
@@ -6794,27 +6794,23 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "Näytä pelaajaponnahdusikkunat"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "Siirrä alas"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "Vasemmalle"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "Oikealle"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
@@ -6823,27 +6819,23 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "Siirrä ylös"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "Siirrä alas"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "Vasemmalle"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "Oikealle"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6881,9 +6873,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "Huomioi jälleen"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6897,9 +6888,8 @@ msgstr "Jätä huomiotta syöte 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "Vie alas"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6908,45 +6898,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "Pelaajan sijainti:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "Vie vasemmalle"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "Vie oikealle"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "Vie ylös"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "Vie alas"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "Vie vasemmalle"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "Vie oikealle"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7195,9 +7178,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "Nollaa tiedot"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/fr.po b/po/fr.po
index ed78f80d9..ebd8d3a13 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-13 08:23+0000\n"
-"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
+"PO-Revision-Date: 2014-12-29 09:57+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
 "fr/)\n"
 "Language: fr\n"
@@ -6845,57 +6845,48 @@ msgstr "Touches de déplacement"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "Afficher les pop-ups des joueurs"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "Aller vers le bas"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "Aller à gauche"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "Aller à droite"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
-#, fuzzy
 msgid "Move player forward"
-msgstr "Aller devant"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "Aller vers le haut"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "Aller vers le bas"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "Aller à gauche"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "Aller à droite"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6933,9 +6924,8 @@ msgstr "Raccourci de \"Aller au point de navigation\" %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "Ne plus ignorer"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6949,9 +6939,8 @@ msgstr "Ignorer l'entrée 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "Vers le bas"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6960,45 +6949,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "Joueur touche monstre"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "Vers la gauche"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "Vers la droite"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "Vers le haut"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "Vers le bas"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "Vers la gauche"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "Vers la droite"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7247,9 +7229,8 @@ msgstr "Virer ton mercenaire"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "Remettre les statistiques"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/he.po b/po/he.po
index 967a72a3d..aa6531667 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-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: Hebrew (http://www.transifex.com/projects/p/manaplus/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,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 ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 "אישור"
 
 #. 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 "לא ניתן לשלוח לחישות ריקות!"
 
 #. 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 "שם חבורה חסר."
 
 #. 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 "סגירת תיבת הטקסט האוטומטית."
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr "ההודעה סוגרת את תיבת הטקסט."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr "מקש האנטר כעת סוגר את תיבת הטקסט."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr "ההודעה כעת סוגרת את תיבת הטקסט."
 
 #. 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 ""
 
@@ -417,8 +420,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 ""
 
@@ -492,9 +495,9 @@ msgstr "עזרה"
 #. 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"
@@ -545,14 +548,14 @@ msgstr ""
 #: 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 "שגיאה"
 
@@ -1049,7 +1052,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 ""
 
@@ -1233,8 +1236,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 ""
 
@@ -1485,7 +1488,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 ""
 
@@ -1508,23 +1511,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
@@ -1545,7 +1548,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 "סחרר"
@@ -1560,54 +1563,50 @@ msgstr "סחרר"
 #. 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 "תקוף"
 
 #. 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 ""
 
@@ -1625,9 +1624,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 ""
@@ -1636,7 +1635,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 "דבר"
@@ -1648,9 +1647,9 @@ msgstr "דבר"
 #. 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 "קנה"
@@ -1663,7 +1662,7 @@ msgstr "קנה"
 #. 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
@@ -1674,26 +1673,26 @@ msgstr "מכר"
 #. 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 ""
 
@@ -1701,19 +1700,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 ""
 
@@ -1721,19 +1720,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 ""
 
@@ -1741,8 +1740,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
@@ -1754,7 +1753,7 @@ msgstr "הורד"
 
 #. 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 ""
 
@@ -1762,44 +1761,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 "שחקנים"
 
 #. 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 ""
 
@@ -1809,20 +1808,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 ""
 
@@ -1831,77 +1830,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 ""
 
@@ -1911,79 +1910,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 ""
 
@@ -1992,64 +1983,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 "אחסן"
 
-#. 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 "החזר"
 
-#. 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 ""
 
@@ -2059,9 +2034,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
@@ -2069,41 +2044,41 @@ msgid "Use"
 msgstr "השתמש"
 
 #. 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 ""
 
@@ -2111,155 +2086,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 ""
 
@@ -2267,50 +2242,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 "השלך"
 
 #. 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 "פצל"
-
-#. 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 ""
 
@@ -2358,8 +2326,9 @@ msgstr "שיחה"
 #: 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 ""
 
@@ -2597,7 +2566,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"
@@ -2619,7 +2588,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
@@ -2632,7 +2601,7 @@ msgstr "יציאה"
 #. 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
@@ -2645,7 +2614,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
@@ -2657,7 +2626,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"
@@ -2665,8 +2634,8 @@ msgstr "מקסימום"
 
 #. 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 "מחיר: %s / סה\"כ: %s"
@@ -3858,7 +3827,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 "חנות"
 
@@ -3987,7 +3956,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 ""
 
@@ -4914,7 +4883,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 "לבוש"
 
@@ -4925,8 +4894,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 "ציוד"
 
@@ -5067,19 +5036,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"
@@ -5167,7 +5136,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 ""
 
@@ -5175,7 +5144,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:"
@@ -5185,11 +5154,11 @@ 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: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 ""
@@ -5198,72 +5167,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 "זכר"
 
 #. 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 "נקבה"
 
 #. 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 "אנא חלק %d נקודות"
 
 #. 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 "יש להכניס לפחות 4 תוים בשם."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "נתוני שחקן - אישור"
 
 #. 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 "אנא הסר %d נקודות"
@@ -5306,8 +5275,8 @@ msgstr "שחק"
 #. 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 "מידע"
 
@@ -5376,7 +5345,7 @@ msgid "Whispering to %s: %s"
 msgstr "לוחש אל %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 ""
@@ -5493,7 +5462,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
@@ -5504,6 +5473,11 @@ msgstr ""
 msgid "Equip"
 msgstr "השתמש"
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr "פצל"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5988,11 +5962,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 "בקשה למסחר"
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6041,111 +6015,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 "התקבלה הזמנה לחבורה, אך הזמנה זהה כבר קיימת."
 
 #. 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 הזמין אותך לחבורה שלהם."
 
 #. 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 הזמין אותך להצטרף לחבורת %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "אשר את הזמנת חבורה"
 
-#: 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 ""
 
@@ -6294,12 +6268,12 @@ msgid "You give:"
 msgstr "אתה נותן:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr "אין לך מספיק כסף."
 
 #. 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 "הוספת הפריט נכשלה. לא ניתן להכניס מעל חפץ אחד לחלון."
@@ -6320,27 +6294,27 @@ msgstr "מעדכן..."
 msgid "Connecting..."
 msgstr "מתחבר..."
 
-#: 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  תהליך העדכון לא תם."
 
 #. 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  מומלץ ביותר שתנסה שוב מאוחר יותר"
 
 #. 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 "הסתיים"
 
@@ -6741,22 +6715,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 "הזז למעלה"
 
 #. 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 "הזז למטה"
 
 #. 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 "הזז שמאלה"
 
 #. 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 "הזז ימינה"
 
@@ -6816,18 +6790,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
@@ -6850,286 +6862,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 "קלט התעלמות 1"
+msgid "Input ignore"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
-msgstr "קלט התעלמות 2"
+msgid "Ignore input 1"
+msgstr "קלט התעלמות 1"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
-msgstr ""
+msgid "Ignore input 2"
+msgstr "קלט התעלמות 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 ""
@@ -7384,12 +7438,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 ""
 
@@ -7544,8 +7598,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 ""
 
@@ -7663,59 +7717,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"
@@ -7723,26 +7756,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 ""
@@ -7758,27 +7797,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 ""
 
@@ -7815,256 +7854,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 "נותקת מהשרת!"
 
 #. 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 "עוצמה"
 
 #. 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 "זריזות"
 
 #. 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 "חיוניות"
 
-#: 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 "תבונה"
 
 #. 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 "מיומנות"
 
 #. 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 "מזל"
 
 #. 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 ""
 
@@ -8129,13 +8168,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 מעוניין לסחור עימך, האם אתה מסכים?"
@@ -8171,6 +8210,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 ""
diff --git a/po/hr.po b/po/hr.po
index b189c1f24..ea633517b 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-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: Croatian (http://www.transifex.com/projects/p/manaplus/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:131
+#: src/actions/actions.cpp:139
 msgid "File uploaded"
 msgstr ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 "U redu"
 
 #. 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 "Ne mogu poslati prazan šapate!"
 
 #. 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 "Ime partije nedostaje."
 
 #. 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 ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr "Poruka zatvara chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr "Poruka sada zatvara 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 "Pomoć"
 #. 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 ""
 #: 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 "Greška"
 
@@ -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 "Trgovanje"
@@ -1561,54 +1564,50 @@ msgstr "Trgovanje"
 #. 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 "Napad"
 
 #. 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 "Govori"
@@ -1649,9 +1648,9 @@ msgstr "Govori"
 #. 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 "Kupi"
@@ -1664,7 +1663,7 @@ msgstr "Kupi"
 #. 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 "Prodaj"
 #. 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 "Skini opremu"
 
 #. 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 "Igrači"
 
 #. 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 "Pohrani"
 
-#. 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 "Preuzmi"
 
-#. 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 "Upotrijebi"
 
 #. 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 "Ispusti"
 
 #. 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 "Razdvoji"
-
-#. 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 "Izlaz"
 #. 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 "Cijena: %s / Ukupno: %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 "Trgovina"
 
@@ -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 "Oprema"
 
@@ -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 "Zalihe"
 
@@ -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 "Ime:"
 #. 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 "Muško"
 
 #. 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 "Žensko"
 
 #. 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 "Molimo, rasporedi %d bodova"
 
 #. 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 "Ime mora imati barem 4 znaka."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Podaci lika su u redu"
 
 #. 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 "Molimo, oduzmi %d bodova"
@@ -5307,8 +5276,8 @@ msgstr "Igraj"
 #. 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 "Šaptaj prema %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 "Opremi"
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr "Razdvoji"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5991,11 +5965,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 "Zahtjev za Trgovanje"
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6044,111 +6018,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 "Primljen zahtjev za partiju, ali ona već postoji."
 
 #. 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 vas je pozvao/la da se pridružite njihovoj partiji."
 
 #. 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 vas je pozvao/la da se pridružite %s partiji."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: 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 ""
 
@@ -6297,12 +6271,12 @@ msgid "You give:"
 msgstr "Daješ:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr "Nemate dovoljno novca."
 
 #. 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 ""
@@ -6323,27 +6297,27 @@ msgstr "Ažuriranje..."
 msgid "Connecting..."
 msgstr "Spajanje..."
 
-#: 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  Proces ažuriranja je nepotpun."
 
 #. 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  Vrlo je preporučljivo da"
 
 #. 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 "Dovršeno"
 
@@ -6744,22 +6718,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 "Pomakni Gore"
 
 #. 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 "Pomakni Dolje"
 
 #. 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 "Pomakni Ulijevo"
 
 #. 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 "Pomakni Udesno"
 
@@ -6819,18 +6793,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
@@ -6853,286 +6865,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"
+msgid "Input ignore"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
+msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
+msgid "Ignore input 2"
 msgstr ""
 
 #. 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 ""
@@ -7387,12 +7441,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 ""
 
@@ -7547,8 +7601,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 ""
 
@@ -7666,59 +7720,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"
@@ -7726,26 +7759,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 ""
@@ -7761,27 +7800,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 ""
 
@@ -7818,256 +7857,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 ""
 
 #. 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 "Snaga"
 
 #. 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 "Okretnost"
 
 #. 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 "Vitalnost"
 
-#: 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 "Inteligencija"
 
 #. 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 "Spretnost"
 
 #. 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 "Sreća"
 
 #. 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 ""
 
@@ -8132,13 +8171,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 želi trgovati s vama, prihvaćate li?"
@@ -8174,6 +8213,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 ""
diff --git a/po/hu.po b/po/hu.po
index d9f606fd9..e35ac829d 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-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: Hungarian (http://www.transifex.com/projects/p/manaplus/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,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 ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 "Nem küldhetsz üres üzenetet!"
 
 #. 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 "A csapatnév hiányzik."
 
 #. 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 "Az enter megnyitja a bevitelt."
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr "Az üzenet bezárja a bevitelt."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr "Az enter mostantól megnyitja a bevitelt."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr "Az üzenet mostantól bezárja a bevitelt."
 
 #. 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 ""
 
@@ -417,8 +420,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 ""
 
@@ -492,9 +495,9 @@ msgstr "Súgó"
 #. 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"
@@ -545,14 +548,14 @@ msgstr ""
 #: 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 "Hiba"
 
@@ -1049,7 +1052,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 ""
 
@@ -1233,8 +1236,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 ""
 
@@ -1485,7 +1488,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 ""
 
@@ -1508,23 +1511,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
@@ -1545,7 +1548,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 "Üzlet"
@@ -1560,54 +1563,50 @@ msgstr "Üzlet"
 #. 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 "Támadás"
 
 #. 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 ""
 
@@ -1625,9 +1624,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 ""
@@ -1636,7 +1635,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 "Csevegés"
@@ -1648,9 +1647,9 @@ msgstr "Csevegés"
 #. 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 "Vétel"
@@ -1663,7 +1662,7 @@ msgstr "Vétel"
 #. 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
@@ -1674,26 +1673,26 @@ msgstr "Eladás"
 #. 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 ""
 
@@ -1701,19 +1700,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 ""
 
@@ -1721,19 +1720,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 ""
 
@@ -1741,8 +1740,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
@@ -1754,7 +1753,7 @@ msgstr "Nem használ"
 
 #. 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 ""
 
@@ -1762,44 +1761,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 "Játékosok"
 
 #. 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 ""
 
@@ -1809,20 +1808,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 ""
 
@@ -1831,77 +1830,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 ""
 
@@ -1911,79 +1910,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 ""
 
@@ -1992,64 +1983,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 "Raktároz"
 
-#. 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 "Magához vesz"
 
-#. 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 ""
 
@@ -2059,9 +2034,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
@@ -2069,41 +2044,41 @@ msgid "Use"
 msgstr "Bevet"
 
 #. 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 ""
 
@@ -2111,155 +2086,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 ""
 
@@ -2267,50 +2242,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 "Eldob"
 
 #. 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 "Felosztás"
-
-#. 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 ""
 
@@ -2358,8 +2326,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 ""
 
@@ -2597,7 +2566,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"
@@ -2619,7 +2588,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
@@ -2632,7 +2601,7 @@ msgstr "Kilépés"
 #. 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
@@ -2645,7 +2614,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
@@ -2657,7 +2626,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"
@@ -2665,8 +2634,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 "Ár: %s / Teljes: %s"
@@ -3858,7 +3827,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 "Üzlet"
 
@@ -3987,7 +3956,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 ""
 
@@ -4914,7 +4883,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 "Felszerelés"
 
@@ -4925,8 +4894,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 "Táska"
 
@@ -5067,19 +5036,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"
@@ -5167,7 +5136,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 ""
 
@@ -5175,7 +5144,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:"
@@ -5185,11 +5154,11 @@ msgstr "Név:"
 #. 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 ""
@@ -5198,72 +5167,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 "Férfi"
 
 #. 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 "Nő"
 
 #. 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 "Kérlek oszd el a pontjaidat (%d van még)"
 
 #. 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 "A nevednek minimum 4 karakternek kell lennie."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Karakter statok rendben"
 
 #. 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 "Kérlek távolíts el %d pontot"
@@ -5306,8 +5275,8 @@ msgstr "Játék"
 #. 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 "Infó"
 
@@ -5376,7 +5345,7 @@ msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %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 ""
@@ -5493,7 +5462,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
@@ -5504,6 +5473,11 @@ msgstr ""
 msgid "Equip"
 msgstr "Használ"
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr "Felosztás"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5988,11 +5962,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 "Üzleti ajánlat"
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6041,111 +6015,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 "Csapatba hívtak, de neked van csapatod."
 
 #. 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 a csapatába hívott."
 
 #. 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 behívott %s csapatába."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Ajánlat elfogadása"
 
-#: 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 ""
 
@@ -6294,12 +6268,12 @@ msgid "You give:"
 msgstr "Adott tárgyak:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr "Nincs elég pénzed."
 
 #. 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 "Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
@@ -6320,27 +6294,27 @@ msgstr "Frissítés..."
 msgid "Connecting..."
 msgstr "Csatlakozás..."
 
-#: 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 A frissítési folyamat befejezetlen."
 
 #. 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 Erősen ajánljuk, hogy"
 
 #. 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 "Kész"
 
@@ -6741,22 +6715,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 "Mozgás felfelé"
 
 #. 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 "Mozgás lefelé"
 
 #. 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 "Mozgás balra"
 
 #. 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 "Mozgás jobbra"
 
@@ -6816,18 +6790,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
@@ -6850,286 +6862,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 ""
@@ -7384,12 +7438,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 ""
 
@@ -7544,8 +7598,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 ""
 
@@ -7663,59 +7717,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"
@@ -7723,26 +7756,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 ""
@@ -7758,27 +7797,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 ""
 
@@ -7815,256 +7854,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 "Lekapcsolódtál a szerverről!"
 
 #. 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 "Erő"
 
 #. 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 "Mozgékonyság"
 
 #. 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 "Egészség"
 
-#: 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 "Intelligencia"
 
 #. 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 "Ügyesség"
 
 #. 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 "Szerencse"
 
 #. 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 ""
 
@@ -8129,13 +8168,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 üzletelni akar veled. Te akarsz vele?"
@@ -8171,6 +8210,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 ""
diff --git a/po/id.po b/po/id.po
index 98d693a94..256817e0d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-11 10:00+0000\n"
+"PO-Revision-Date: 2014-12-29 09:57+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
 "language/id/)\n"
@@ -6795,51 +6795,43 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "Tampilkan popup pemain"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "Bergerak kebawah"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "Siklus target pemain"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "Siklus target pemain"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
-#, fuzzy
 msgid "Move player forward"
-msgstr "Batas tempat rumah"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "Bergerak keatas"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "Bergerak kebawah"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "Bergerak keatas"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
@@ -6882,9 +6874,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "Batalkan pengabaian"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6908,9 +6899,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "Pemain memukul monster"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
@@ -7189,9 +7179,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "Atur ulang stats"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/it.po b/po/it.po
index 33623a7aa..78c7f048d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-11 10:00+0000\n"
+"PO-Revision-Date: 2014-12-29 09:57+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
 "language/it/)\n"
@@ -6812,57 +6812,48 @@ msgstr "Tasti Movimento"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "Visualizza messaggi popup"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "Muovi Giù"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "Muoviti verso sinistra"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "Muoviti verso destra"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
-#, fuzzy
 msgid "Move player forward"
-msgstr "Muovi telecamera"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "Muovi Su"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "Muovi Giù"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "Muoviti verso sinistra"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "Muoviti verso destra"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6900,9 +6891,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "Stop Ignora"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6916,9 +6906,8 @@ msgstr "Ignora input 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "Direzione Giù"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6927,45 +6916,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "Posizione giocatore:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "Direzione Sinistra"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "Direzione Destra"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "Direzione Su"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "Direzione Giù"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "Direzione Sinistra"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "Direzione Destra"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7214,9 +7196,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "Reset statistiche"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/ja.po b/po/ja.po
index f88cf1f1e..16315f523 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-11 10:00+0000\n"
+"PO-Revision-Date: 2014-12-29 09:57+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
 "language/ja/)\n"
@@ -6797,57 +6797,48 @@ msgstr "キーを移動"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "プレイヤーポップアップを表示する"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "下へ移動"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "左へ移動"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "右へ移動"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
-#, fuzzy
 msgid "Move player forward"
-msgstr "カメラを動かす"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "上へ移動"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "下へ移動"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "左へ移動"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "右へ移動"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6885,9 +6876,8 @@ msgstr "ショートカット %dまで移動"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "完全無視解除"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6901,9 +6891,8 @@ msgstr "インプット２完全無視"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "下方向"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6912,45 +6901,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "プレイヤーの位置:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "左方向"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "右方向"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "上方向"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "下方向"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "左方向"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "右方向"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7199,9 +7181,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "統計をリセット"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/ka.po b/po/ka.po
index b50d6abcd..b47fe6570 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-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: Georgian (http://www.transifex.com/projects/p/manaplus/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:131
+#: src/actions/actions.cpp:139
 msgid "File uploaded"
 msgstr ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr ""
 
 #. 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 ""
 
@@ -416,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: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 ""
 
@@ -491,9 +494,9 @@ msgstr ""
 #. 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"
@@ -544,14 +547,14 @@ msgstr ""
 #: 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 ""
 
@@ -1048,7 +1051,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 ""
 
@@ -1232,8 +1235,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 ""
 
@@ -1484,7 +1487,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 ""
 
@@ -1507,23 +1510,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
@@ -1544,7 +1547,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 ""
@@ -1559,54 +1562,50 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
@@ -1624,9 +1623,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 ""
@@ -1635,7 +1634,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 ""
@@ -1647,9 +1646,9 @@ msgstr ""
 #. 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 ""
@@ -1662,7 +1661,7 @@ msgstr ""
 #. 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
@@ -1673,26 +1672,26 @@ msgstr ""
 #. 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 ""
 
@@ -1700,19 +1699,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 ""
 
@@ -1720,19 +1719,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 ""
 
@@ -1740,8 +1739,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
@@ -1753,7 +1752,7 @@ msgstr ""
 
 #. 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 ""
 
@@ -1761,44 +1760,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 ""
 
 #. 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 ""
 
@@ -1808,20 +1807,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 ""
 
@@ -1830,77 +1829,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 ""
 
@@ -1910,79 +1909,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 ""
 
@@ -1991,64 +1982,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 ""
 
-#. 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 ""
 
-#. 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 ""
 
@@ -2058,9 +2033,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
@@ -2068,41 +2043,41 @@ msgid "Use"
 msgstr ""
 
 #. 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 ""
 
@@ -2110,155 +2085,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 ""
 
@@ -2266,50 +2241,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 ""
 
 #. 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 ""
-
-#. 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 ""
 
@@ -2357,8 +2325,9 @@ msgstr ""
 #: 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 ""
 
@@ -2596,7 +2565,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"
@@ -2618,7 +2587,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
@@ -2631,7 +2600,7 @@ msgstr ""
 #. 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
@@ -2644,7 +2613,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
@@ -2656,7 +2625,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"
@@ -2664,8 +2633,8 @@ msgstr ""
 
 #. 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 ""
@@ -3857,7 +3826,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 ""
 
@@ -3986,7 +3955,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 ""
 
@@ -4913,7 +4882,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 ""
 
@@ -4924,8 +4893,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 ""
 
@@ -5066,19 +5035,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"
@@ -5166,7 +5135,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 ""
 
@@ -5174,7 +5143,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:"
@@ -5184,11 +5153,11 @@ 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: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 ""
@@ -5197,72 +5166,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr ""
 
 #. 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 ""
@@ -5305,8 +5274,8 @@ msgstr ""
 #. 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 ""
 
@@ -5375,7 +5344,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. 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 ""
@@ -5492,7 +5461,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
@@ -5503,6 +5472,11 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5985,11 +5959,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 ""
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6038,111 +6012,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr ""
 
-#: 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 ""
 
@@ -6291,12 +6265,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr ""
 
 #. 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 ""
@@ -6317,27 +6291,27 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6738,22 +6712,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6813,18 +6787,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
@@ -6847,286 +6859,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"
+msgid "Input ignore"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
+msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
+msgid "Ignore input 2"
 msgstr ""
 
 #. 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 ""
@@ -7381,12 +7435,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 ""
 
@@ -7541,8 +7595,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 ""
 
@@ -7660,59 +7714,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"
@@ -7720,26 +7753,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 ""
@@ -7755,27 +7794,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 ""
 
@@ -7812,256 +7851,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -8126,13 +8165,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 ""
@@ -8168,6 +8207,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 ""
diff --git a/po/nb.po b/po/nb.po
index 8dab23042..a75e06324 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-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: Norwegian Bokmål (http://www.transifex.com/projects/p/manaplus/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,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 ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 "Kan ikke sende tomme meldinger!"
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr ""
 
 #. 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 ""
 
@@ -417,8 +420,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 ""
 
@@ -492,9 +495,9 @@ msgstr "Hjelp"
 #. 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"
@@ -545,14 +548,14 @@ msgstr ""
 #: 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 "Feil"
 
@@ -1049,7 +1052,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 ""
 
@@ -1233,8 +1236,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 ""
 
@@ -1485,7 +1488,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 ""
 
@@ -1508,23 +1511,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
@@ -1545,7 +1548,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 ""
@@ -1560,54 +1563,50 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
@@ -1625,9 +1624,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 ""
@@ -1636,7 +1635,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 ""
@@ -1648,9 +1647,9 @@ msgstr ""
 #. 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 "Kjøp"
@@ -1663,7 +1662,7 @@ msgstr "Kjøp"
 #. 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
@@ -1674,26 +1673,26 @@ msgstr "Selg"
 #. 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 ""
 
@@ -1701,19 +1700,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 ""
 
@@ -1721,19 +1720,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 ""
 
@@ -1741,8 +1740,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
@@ -1754,7 +1753,7 @@ msgstr ""
 
 #. 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 ""
 
@@ -1762,44 +1761,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 "Spillere"
 
 #. 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 ""
 
@@ -1809,20 +1808,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 ""
 
@@ -1831,77 +1830,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 ""
 
@@ -1911,79 +1910,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 ""
 
@@ -1992,64 +1983,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 ""
 
-#. 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 ""
 
-#. 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 ""
 
@@ -2059,9 +2034,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
@@ -2069,41 +2044,41 @@ msgid "Use"
 msgstr "Bruk"
 
 #. 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 ""
 
@@ -2111,155 +2086,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 ""
 
@@ -2267,50 +2242,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 ""
 
 #. 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 "Del opp"
-
-#. 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 ""
 
@@ -2358,8 +2326,9 @@ msgstr ""
 #: 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 ""
 
@@ -2597,7 +2566,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"
@@ -2619,7 +2588,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
@@ -2632,7 +2601,7 @@ msgstr "Avslutt"
 #. 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
@@ -2645,7 +2614,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
@@ -2657,7 +2626,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"
@@ -2665,8 +2634,8 @@ msgstr "Maks"
 
 #. 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 "Pris: %s / Totalt: %s"
@@ -3858,7 +3827,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 "Butikk"
 
@@ -3987,7 +3956,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 ""
 
@@ -4914,7 +4883,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 "Utstyr"
 
@@ -4925,8 +4894,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 ""
 
@@ -5067,19 +5036,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"
@@ -5167,7 +5136,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 ""
 
@@ -5175,7 +5144,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:"
@@ -5185,11 +5154,11 @@ msgstr "Navn:"
 #. 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 ""
@@ -5198,72 +5167,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 "Mann"
 
 #. 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 "Kvinne"
 
 #. 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 "Vennligst distribuer %d poeng"
 
 #. 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 "Navnet ditt må minst være 4 bokstaver."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr ""
 
 #. 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 "Vennligst fjern %d poeng"
@@ -5306,8 +5275,8 @@ msgstr ""
 #. 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 ""
 
@@ -5376,7 +5345,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. 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 ""
@@ -5493,7 +5462,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
@@ -5504,6 +5473,11 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr "Del opp"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5988,11 +5962,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 ""
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6041,111 +6015,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 ""
 
 #. 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 har invitert deg til sin gruppe."
 
 #. 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 ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Godta Gruppeinvitasjon"
 
-#: 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 ""
 
@@ -6294,12 +6268,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr ""
 
 #. 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 ""
@@ -6320,27 +6294,27 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Kobler til..."
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6741,22 +6715,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6816,18 +6790,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
@@ -6850,286 +6862,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"
+msgid "Input ignore"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
+msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
+msgid "Ignore input 2"
 msgstr ""
 
 #. 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 ""
@@ -7384,12 +7438,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 ""
 
@@ -7544,8 +7598,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 ""
 
@@ -7663,59 +7717,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"
@@ -7723,26 +7756,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 ""
@@ -7758,27 +7797,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 ""
 
@@ -7815,256 +7854,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -8129,13 +8168,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 ""
@@ -8171,6 +8210,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 ""
diff --git a/po/nl.po b/po/nl.po
index 8c1ccb271..48027f4f0 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-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: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,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 ""
 
@@ -35,7 +35,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
@@ -46,231 +46,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 "Cache gewist"
 
 #. 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 "Client uptime: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:889
+#: src/actions/actions.cpp:1041
 #, c-format
 msgid "%d week"
 msgstr "%d weken"
 
-#: 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 "%d dagen"
 
-#: 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 "%d uren"
 
-#: 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 "%d minuten"
 
-#: 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 "%d seconden"
 
-#: 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 "Kan geen lege berichten sturen!"
 
 #. 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 "Groepsnaam ontbreekt."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:333
 msgid "Guild name is missing."
 msgstr "Guild-naam ontbreekt."
 
 #. 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 "Gelieve een naam te specifiëren."
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Return toggles chat."
 msgstr "Ga terug naar chat."
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr "Ga nu terug naar chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:107
+#: src/actions/commands.cpp:114
 #, c-format
 msgid "Player already %s!"
 msgstr "Speler reeds %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:119
+#: src/actions/commands.cpp:127
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Speler succesvol %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:129
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Speler kan niet %s zijn!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:160
 msgid "Player wasn't ignored!"
 msgstr "Speler is niet genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:161
+#: src/actions/commands.cpp:169
 msgid "Player no longer ignored!"
 msgstr "Speler niet langer genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:171
 msgid "Player could not be unignored!"
 msgstr "Speler kan niet worden genegeerd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:178
+#: src/actions/commands.cpp:186
 msgid "Player already erased!"
 msgstr "Speler reeds verwijderd!"
 
 #. 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 "Speler kan niet worden verwijderd!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:200
+#: src/actions/commands.cpp:208
 msgid "friend"
 msgstr "vriend"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:215
 msgid "disregarded"
 msgstr "genegeerd"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:214
+#: src/actions/commands.cpp:222
 msgid "neutral"
 msgstr "neutraal"
 
 #. 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 "vijand"
 
@@ -290,25 +293,25 @@ msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
 #. 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 "ontwijkt"
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr "mist"
 
 #. 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 "A"
 
 #. 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 "I"
 
@@ -420,8 +423,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 "Volledig genegeerd"
 
@@ -495,9 +498,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"
@@ -548,14 +551,14 @@ msgstr "Wijzigen spelservers"
 #: 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 "Fout"
 
@@ -1052,7 +1055,7 @@ msgstr "Bericht"
 #. 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 ""
 
@@ -1236,8 +1239,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 "(standaard)"
 
@@ -1488,7 +1491,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 "Groep aanmaken"
 
@@ -1511,23 +1514,23 @@ 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: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
@@ -1548,7 +1551,7 @@ msgstr "Gewicht: %s"
 #. 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 "Handel"
@@ -1563,54 +1566,50 @@ msgstr "Handel"
 #. 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 "Aanvallen"
 
 #. 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 "Fluister"
 
 #. 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 "Genees"
 
 #. 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 "Uit de gilde gooien"
 
 #. 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 "De positie binnen de gilde veranderen"
 
 #. 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 "Uitnodigen voor de gilde"
 
 #. 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 "Nuke"
 
@@ -1628,9 +1627,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: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 "Beweeg"
@@ -1639,7 +1638,7 @@ msgstr "Beweeg"
 #. 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 "Spreken"
@@ -1651,9 +1650,9 @@ msgstr "Spreken"
 #. 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 "Kopen"
@@ -1666,7 +1665,7 @@ msgstr "Kopen"
 #. 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
@@ -1677,26 +1676,26 @@ msgstr "Verkopen"
 #. 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 "Van de aanvalslijst verwijderen"
 
 #. 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 "Aan de prioriteitsaanvalslijst toevoegen"
 
 #. 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 "Aan de aanvalslijst toevoegen"
 
@@ -1704,19 +1703,19 @@ 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: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 "an de negeerlijst toevoegen"
 
 #. 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 ""
 
@@ -1724,19 +1723,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 ""
 
@@ -1744,8 +1743,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
@@ -1757,7 +1756,7 @@ msgstr "Afdoen"
 
 #. 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 ""
 
@@ -1765,44 +1764,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 "Naam aan het gesprek toevoegen"
 
 #. 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 "Spelers"
 
 #. 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 "Uit de groep gooien"
 
 #. 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 "Raap op"
 
 #. 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 "Aan chat toevoegen"
 
 #. 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 "Plaats voorwerp op de kaart"
 
 #. 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 "Hernoem"
 
@@ -1812,20 +1811,20 @@ msgstr "Hernoem"
 #. 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 "Verwijder"
 
 #. 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 ""
 
@@ -1834,77 +1833,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 "Kleren"
 
 #. 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 "Spreuken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:696
+#: src/gui/popups/popupmenu.cpp:689
 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:727 src/gui/windows/npcdialog.cpp:109
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Wissen"
 
 #. 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 "Markering afzetten"
 
 #. 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 "Markering aanzetten"
 
 #. 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 "Verwijder naam"
 
 #. 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 "away aanzetten"
 
 #. 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 "away afzetten"
 
 #. 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 "Verlaat"
 
@@ -1914,79 +1913,71 @@ msgstr "Verlaat"
 #. 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 "Wijzig uw guild positie"
 
 #. 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 "Kaart bordje hernoemen   "
 
 #. 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 "Naam:                    "
 
-#: 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 ""
 
@@ -1995,64 +1986,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 "Opslaan"
 
-#. 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 "Plaats 10"
 
-#. 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 "Plaats de helft"
 
-#. 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 "Plaats alles"
 
 #. 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 "Afhalen"
 
-#. 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 "Haal 10 op"
 
-#. 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 "Haal de helft op"
 
-#. 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 "Haal alles op"
 
@@ -2062,9 +2037,9 @@ msgstr "Haal alles op"
 #. 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
@@ -2072,41 +2047,41 @@ msgid "Use"
 msgstr "Gebruiken"
 
 #. 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 "Verberg"
 
 #. 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 "Toon"
 
 #. 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 "Kopieer naar chat"
 
 #. 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 "Beweeg naar boven"
 
 #. 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 "Beweeg naar beneden"
 
@@ -2114,155 +2089,155 @@ msgstr "Beweeg naar beneden"
 #. 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 "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2130
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2133
 msgid "Paste"
 msgstr "Plakken"
 
 #. 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 "Geen rekening mee houden"
 
 #. 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 "Negeer"
 
 #. 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 "Wis"
 
 #. 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 "Word vriend"
 
 #. 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 "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2351
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Imitation"
 msgstr "Imiteer"
 
 #. 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 "Koop (?)"
 
 #. 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 "Verkoop (?)"
 
 #. 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 "uitnodigen voor de groep"
 
-#: 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 "Toon Voorwerpen"
 
 #. 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 "Neerleggen..."
 
 #. 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 "Laat alles vallen"
 
@@ -2270,50 +2245,43 @@ msgstr "Laat alles vallen"
 #. 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 "Neerleggen"
 
 #. 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 "Splitsen"
-
-#. 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 "Ga naar"
 
 #. 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 "Schop"
 
@@ -2361,8 +2329,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 "Andere"
 
@@ -2600,7 +2569,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"
@@ -2622,7 +2591,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
@@ -2635,7 +2604,7 @@ msgstr "Afsluiten"
 #. 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
@@ -2648,7 +2617,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
@@ -2660,7 +2629,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"
@@ -2668,8 +2637,8 @@ msgstr "Maximum"
 
 #. 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 "Prijs: %s / Totaal: %s"
@@ -3861,7 +3830,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 "Winkel"
 
@@ -3990,7 +3959,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 ""
 
@@ -4917,7 +4886,7 @@ msgstr "UITR"
 #. 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 "Uitrusting"
 
@@ -4928,8 +4897,8 @@ msgstr "INV"
 
 #. 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 "Inventaris"
 
@@ -5070,19 +5039,19 @@ msgid "Result"
 msgstr "Resultaat"
 
 #. 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"
@@ -5170,7 +5139,7 @@ msgid "The new password entries mismatch."
 msgstr "De nieuwe paswoord ingaven zijn niet gelijk."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:75
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr ""
 
@@ -5178,7 +5147,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:"
@@ -5188,11 +5157,11 @@ msgstr "Naam:"
 #. 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 ">"
@@ -5201,72 +5170,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 "Haarkleur:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Haarstijl:"
 
 #. 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 "Mannelijk"
 
 #. 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 "Vrouwelijk"
 
 #. 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 "Nog %d punten te verdelen"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Ras:"
 
 #. 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 "Je naam moet uit tenminste 4 tekens bestaan."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Attributen van personage 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 "Verwijder alstublieft %d punten"
@@ -5309,8 +5278,8 @@ msgstr "Spelen"
 #. 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"
 
@@ -5379,7 +5348,7 @@ msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %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 ""
@@ -5496,7 +5465,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
@@ -5507,6 +5476,11 @@ msgstr ""
 msgid "Equip"
 msgstr "Uitrusten"
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr "Splitsen"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5991,11 +5965,11 @@ msgstr "Toon links in aankondigingen"
 
 #. 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 "Handel aanvragen"
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s wilt %s %s ga je akkoord?"
@@ -6044,111 +6018,111 @@ msgid "Invite"
 msgstr "Nodig uit"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging voor groep %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging voor groep %s geweigerd."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging voor guild %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging voor guild %s geweigerd."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Maken van guild %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Maken van groep %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Guild Naam"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Kies uw guild naam."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
 #. 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 "%s heeft je uitgenodigd om guid %s te vervoegen."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Guild Uitnodiging Aanvaarden"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
 #. 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 "U bent uitgenodigd om je bij een groep te voegen."
 
 #. 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 "U bent uitgenodigd om je bij groep %s te voegen."
 
 #. 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 heeft je uitgenodigd om je bij hun groep te voegen."
 
 #. 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 heeft je uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/windows/socialwindow.cpp:500
+#: src/gui/windows/socialwindow.cpp:503
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan groep niet aanmaken. Je bent al in een groep."
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Party Name"
 msgstr "Groep Naam"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:514
 msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
@@ -6297,12 +6271,12 @@ msgid "You give:"
 msgstr "Je geeft:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
 #. 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 "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in het venster."
@@ -6323,27 +6297,27 @@ msgstr "Actualiseren..."
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: 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 Het updateproces is onvolledig."
 
 #. 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 Het is ten sterkste aanbevolen dat"
 
 #. 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 "##1  probeer later opnieuw."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1019
+#: src/gui/windows/updaterwindow.cpp:1020
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -6744,22 +6718,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 "Omhoog"
 
 #. 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 "Omlaag"
 
 #. 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 "Naar links"
 
 #. 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 "Naar rechts"
 
@@ -6819,18 +6793,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
@@ -6853,286 +6865,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 "Ingave 1 negeren"
+msgid "Input ignore"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
-msgstr "Ingave 2 negeren"
+msgid "Ignore input 1"
+msgstr "Ingave 1 negeren"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
-msgstr "Juist Boven"
+msgid "Ignore input 2"
+msgstr "Ingave 2 negeren"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-msgid "Direct Down"
-msgstr "Juist Onder"
+msgid "Direction keys"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
-msgid "Direct Left"
-msgstr "Juist Links"
+msgid "Player direct up"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-msgid "Direct Right"
-msgstr "Juist Rechts"
+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 "Pet direct up"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:90
+msgid "Pet direct down"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:96
+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 "Snel N Voorwerpen van slot 0 neerleggen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:90
+#: src/input/pages/other.cpp:132
 msgid "Quick Drop N Items"
 msgstr "Snel N Voorwerpen Neerleggen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:96
+#: src/input/pages/other.cpp:138
 msgid "Switch Quick Drop Counter"
 msgstr "Wissel Snel Neerleggingsteller"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:102
+#: src/input/pages/other.cpp:144
 msgid "Quick heal target or self"
 msgstr "Snel jezelf of iemand anders genezen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:108
+#: src/input/pages/other.cpp:150
 msgid "Use #itenplz spell"
 msgstr "Gebruik #itenplz spreuk"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:114
+#: src/input/pages/other.cpp:156
 msgid "Use magic attack"
 msgstr "Gebruik magie aanval"
 
 #. 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 "Verander het bewegingstype"
 
 #. 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 "Aan / Uit audio"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:174
+#: src/input/pages/other.cpp:216
 msgid "Enable / Disable away mode"
 msgstr "Afwezigheidsmodus inschakelen/uitschakelen"
 
 #. 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 ""
@@ -7387,12 +7441,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 "Winkelkar"
 
@@ -7547,8 +7601,8 @@ 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: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 "Verkeerde naam."
 
@@ -7666,59 +7720,38 @@ msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
-msgid "Account was not found. Please re-login."
-msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
-
-#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
-msgid "Old password incorrect."
-msgstr "Oud wachtwoord is ongeldig."
-
-#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166
-msgid "New password too short."
-msgstr "Nieuw wachtwoord is te kort."
-
-#. 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 "Onbekende fout."
-
-#. 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 "Verkeerd wachtwoord."
 
 #. 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 "Geweigered door de server."
 
 #. 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 "Client is te oud."
 
 #. 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"
@@ -7726,26 +7759,32 @@ 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: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 "Deze gebruikersnaam is al genomen."
 
 #. 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 "Gebruikersnaam is compleet verwijderd."
 
 #. 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 "Onbekende fout."
+
+#. TRANSLATORS: error message
 #: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr "Leeg adres gegeven aan Network::connect()!"
@@ -7761,27 +7800,27 @@ msgid "Connection to server terminated. "
 msgstr "Verbinding met server beëindigd. "
 
 #. 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 ""
 
@@ -7818,256 +7857,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 "Authenticatie gefaald."
 
 #. 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 "Geen servers beschikbaar."
 
 #. 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 "Iemand anders is aan het proberen deze account te gebruiken."
 
 #. 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 "Deze account is al ingelogd."
 
 #. 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 "Snelheidshack gedetecteerd."
 
-#: 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 "Verdubbelde login."
 
-#: 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 "Onbekende connectiefout."
 
-#: 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 "De verbinding met de server werd verbroken!"
 
 #. 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 "Kracht"
 
 #. 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 "Behendigheid"
 
 #. 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 "Vitaliteit"
 
-#: 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 "Intelligentie"
 
 #. 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 "Handigheid"
 
 #. 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 "Geluk"
 
 #. 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 "Verdediging"
 
 #. 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 "M.Aanval"
 
 #. 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 "M.Verdediging"
 
 #. 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 "% Nauwkeurigheid"
 
 #. 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 "% Ontwijking"
 
 #. 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 "Aanvalsvertraging"
 
 #. 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 "Wandelvertraging"
 
 #. 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 "Aanvalsbereik"
 
 #. 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 ""
 
@@ -8132,13 +8171,13 @@ msgid "Huh? What's that?"
 msgstr "Huh? Wat is dat?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:87
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Handelen: Jij en %s"
 
 #. 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 wil met jou handelen, aanvaard je dit?"
@@ -8174,6 +8213,21 @@ msgid "Luck:"
 msgstr "Geluk:"
 
 #. TRANSLATORS: error message
+#: src/net/tmwa/loginhandler.cpp:274
+msgid "Account was not found. Please re-login."
+msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/loginhandler.cpp:278
+msgid "Old password incorrect."
+msgstr "Oud wachtwoord is ongeldig."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/loginhandler.cpp:282
+msgid "New password too short."
+msgstr "Nieuw wachtwoord is te kort."
+
+#. TRANSLATORS: error message
 #: src/net/tmwa/skillhandler.cpp:190
 msgid "Trade failed!"
 msgstr "Handel mislukte!"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 9b800894b..67e478f4a 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-11 10:00+0000\n"
+"PO-Revision-Date: 2014-12-29 09:57+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"
@@ -6803,57 +6803,48 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "Geef de spelers popups weer"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "Beweeg naar beneden"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "Naar links"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "Naar rechts"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
-#, fuzzy
 msgid "Move player forward"
-msgstr "Thuisplaatsgrens"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "Beweeg naar boven"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "Beweeg naar beneden"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "Naar links"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "Naar rechts"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6891,9 +6882,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "Stop Negeren"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6907,9 +6897,8 @@ msgstr "Ingave 2 negeren"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "Juist Onder"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6918,45 +6907,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "Speler raakt monster"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "Juist Links"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "Juist Rechts"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "Juist Boven"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "Juist Onder"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "Juist Links"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "Juist Rechts"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7205,9 +7187,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "Herzet statistieken"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/pl.po b/po/pl.po
index 7600bb561..0c9550e42 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-11 10:00+0000\n"
+"PO-Revision-Date: 2014-12-29 09:57+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
 "pl/)\n"
@@ -6821,57 +6821,48 @@ msgstr "Klawisze poruszania się"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "Pokazuj wyskakujące powiadomienia graczy"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "W dół"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "Idź w lewo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "Idź w prawo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
-#, fuzzy
 msgid "Move player forward"
-msgstr "Idź naprzód"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "W górę"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "W dół"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "Idź w lewo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "Idź w prawo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6909,9 +6900,8 @@ msgstr "Przejdź do punktu skrótu %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "Odignoruj"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6925,9 +6915,8 @@ msgstr "Ignoruj wprowadzenie 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "Skieruj się w dół"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6936,45 +6925,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "Gracz uderza potwora"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "Skieruj się w lewo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "Skieruj się w prawo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "Skieruj się w górę"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "Skieruj się w dół"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "Skieruj się w lewo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "Skieruj się w prawo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7223,9 +7205,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "Zresetuj statystyki"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/pt.po b/po/pt.po
index b00f62443..e72aa8ff5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-11 10:00+0000\n"
+"PO-Revision-Date: 2014-12-29 09:57+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
 "language/pt/)\n"
@@ -6809,57 +6809,48 @@ msgstr "Teclas de movimento"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "Mostrar popups de jogadores"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "Mover a baixo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "Esquerda"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "Direita"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
-#, fuzzy
 msgid "Move player forward"
-msgstr "Borda do Lugar Inicial"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "Mover a cima"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "Mover a baixo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "Esquerda"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "Direita"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6897,9 +6888,8 @@ msgstr "Mover para ponto %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "Não ignorar"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6913,9 +6903,8 @@ msgstr "Ignorar input 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "Para baixo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6924,45 +6913,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "Jogador acerta Monstro"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "Para esquerda"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "Para direita"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "Para cima"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "Para baixo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "Para esquerda"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "Para direita"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7211,9 +7193,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "Resetar Status"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 172bf41fa..122d30eeb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -23,8 +23,8 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-27 19:06+0000\n"
-"Last-Translator: Fernanda Monteiro <crie.fernanda@gmail.com>\n"
+"PO-Revision-Date: 2014-12-29 09:57+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"
 "Language: pt_BR\n"
@@ -6826,57 +6826,48 @@ msgstr "Tecla de movimento"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "Mostrar popups de jogadores"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "Mover para baixo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "Esquerda"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "Direita"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
-#, fuzzy
 msgid "Move player forward"
-msgstr "Mover para Frente"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "Mover para cima"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "Mover para baixo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "Esquerda"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "Direita"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6914,9 +6905,8 @@ msgstr "Mover para o atalho %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "Não ignorar"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6930,9 +6920,8 @@ msgstr "Ignorar input 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "Para baixo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6941,45 +6930,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "Jogador acerta Monstro"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "Para esquerda"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "Para direita"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "Para cima"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "Para baixo"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "Para esquerda"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "Para direita"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7228,9 +7210,8 @@ msgstr "Dispensar seu mercenário"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "Resetar status"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/ru.po b/po/ru.po
index 3abb03a85..53139fa18 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-24 15:08+0000\n"
-"Last-Translator: Alexsl <alexlsh@mail.ru>\n"
+"PO-Revision-Date: 2014-12-29 09:57+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
 "language/ru/)\n"
 "Language: ru\n"
@@ -6829,57 +6829,48 @@ msgstr "Кнопки движения"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "Показ. всплыв. сообщения игроков"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "Передвинуть ниже"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "Движение влево"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "Движение вправо"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
-#, fuzzy
 msgid "Move player forward"
-msgstr "Движение вперед"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "Передвинуть выше"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "Передвинуть ниже"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "Движение влево"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "Движение вправо"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6917,9 +6908,8 @@ msgstr "Перейти к точке %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "Не игнорировать"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6933,9 +6923,8 @@ msgstr "Игнорирование ввода 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "Повернуться вниз"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6944,45 +6933,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "Удар игрока по монстру"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "Повернуться влево"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "Повернуться вправо"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "Повернуться вверх"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "Повернуться вниз"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "Повернуться влево"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "Повернуться вправо"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7231,9 +7213,8 @@ msgstr "Уволить наемника"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "Сбросить стат."
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/sk.po b/po/sk.po
index bb101351a..f03b77b0c 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-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: Slovak (http://www.transifex.com/projects/p/manaplus/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:131
+#: src/actions/actions.cpp:139
 msgid "File uploaded"
 msgstr ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 "Potvrdiť"
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr ""
 
 #. 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 "Nápoveda"
 #. 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 ""
 #: 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 "Chyba"
 
@@ -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 ""
@@ -1561,54 +1564,50 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
@@ -1649,9 +1648,9 @@ msgstr ""
 #. 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 "Kúpiť"
@@ -1664,7 +1663,7 @@ msgstr "Kúpiť"
 #. 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 "Predaj"
 #. 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 "Odstrojiť"
 
 #. 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 ""
 
 #. 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 ""
 
-#. 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 ""
 
-#. 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 "Použiť"
 
 #. 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 "Zahodiť"
 
 #. 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 ""
-
-#. 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 ""
 #: 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 "Ukončiť"
 #. 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 ""
 
 #. 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 ""
@@ -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 "Obchod"
 
@@ -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 "Vybavenie"
 
@@ -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 "Inventár"
 
@@ -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 "Meno:"
 #. 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 "Muž"
 
 #. 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 "Žena"
 
 #. 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 "Prosím rozdeľ %d bodov"
 
 #. 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 "Tvoje meno musí mať aspoň 4 písmená."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Charakterové staty 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 "Prosím odstráň %d bodov"
@@ -5307,8 +5276,8 @@ msgstr ""
 #. 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 ""
 
@@ -5377,7 +5346,7 @@ msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %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 "Vystrojiť"
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5991,11 +5965,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 ""
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6044,111 +6018,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr ""
 
-#: 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 ""
 
@@ -6297,12 +6271,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr ""
 
 #. 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 ""
@@ -6323,27 +6297,27 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Pripájam sa..."
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6744,22 +6718,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6819,18 +6793,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
@@ -6853,286 +6865,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"
+msgid "Input ignore"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
+msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
+msgid "Ignore input 2"
 msgstr ""
 
 #. 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 ""
@@ -7387,12 +7441,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 ""
 
@@ -7547,8 +7601,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 ""
 
@@ -7666,59 +7720,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"
@@ -7726,26 +7759,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 ""
@@ -7761,27 +7800,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 ""
 
@@ -7818,256 +7857,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -8132,13 +8171,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 ""
@@ -8174,6 +8213,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 ""
diff --git a/po/sq.po b/po/sq.po
index fd649ba8d..9f79de7e2 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-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: Albanian (http://www.transifex.com/projects/p/manaplus/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,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 ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr ""
 
 #. 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 ""
 
@@ -417,8 +420,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 ""
 
@@ -492,9 +495,9 @@ msgstr ""
 #. 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"
@@ -545,14 +548,14 @@ msgstr ""
 #: 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 ""
 
@@ -1049,7 +1052,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 ""
 
@@ -1233,8 +1236,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 ""
 
@@ -1485,7 +1488,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 ""
 
@@ -1508,23 +1511,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
@@ -1545,7 +1548,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 ""
@@ -1560,54 +1563,50 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
@@ -1625,9 +1624,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 ""
@@ -1636,7 +1635,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 ""
@@ -1648,9 +1647,9 @@ msgstr ""
 #. 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 ""
@@ -1663,7 +1662,7 @@ msgstr ""
 #. 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
@@ -1674,26 +1673,26 @@ msgstr ""
 #. 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 ""
 
@@ -1701,19 +1700,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 ""
 
@@ -1721,19 +1720,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 ""
 
@@ -1741,8 +1740,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
@@ -1754,7 +1753,7 @@ msgstr ""
 
 #. 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 ""
 
@@ -1762,44 +1761,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 ""
 
 #. 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 ""
 
@@ -1809,20 +1808,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 ""
 
@@ -1831,77 +1830,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 ""
 
@@ -1911,79 +1910,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 ""
 
@@ -1992,64 +1983,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 ""
 
-#. 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 ""
 
-#. 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 ""
 
@@ -2059,9 +2034,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
@@ -2069,41 +2044,41 @@ msgid "Use"
 msgstr ""
 
 #. 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 ""
 
@@ -2111,155 +2086,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 ""
 
@@ -2267,50 +2242,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 ""
 
 #. 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 ""
-
-#. 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 ""
 
@@ -2358,8 +2326,9 @@ msgstr ""
 #: 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 ""
 
@@ -2597,7 +2566,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"
@@ -2619,7 +2588,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
@@ -2632,7 +2601,7 @@ msgstr ""
 #. 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
@@ -2645,7 +2614,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
@@ -2657,7 +2626,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"
@@ -2665,8 +2634,8 @@ msgstr ""
 
 #. 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 ""
@@ -3858,7 +3827,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 ""
 
@@ -3987,7 +3956,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 ""
 
@@ -4914,7 +4883,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 ""
 
@@ -4925,8 +4894,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 ""
 
@@ -5067,19 +5036,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"
@@ -5167,7 +5136,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 ""
 
@@ -5175,7 +5144,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:"
@@ -5185,11 +5154,11 @@ 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: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 ""
@@ -5198,72 +5167,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr ""
 
 #. 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 ""
@@ -5306,8 +5275,8 @@ msgstr ""
 #. 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 ""
 
@@ -5376,7 +5345,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. 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 ""
@@ -5493,7 +5462,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
@@ -5504,6 +5473,11 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5988,11 +5962,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 ""
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6041,111 +6015,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr ""
 
-#: 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 ""
 
@@ -6294,12 +6268,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr ""
 
 #. 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 ""
@@ -6320,27 +6294,27 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6741,22 +6715,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6816,18 +6790,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
@@ -6850,286 +6862,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"
+msgid "Input ignore"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
+msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
+msgid "Ignore input 2"
 msgstr ""
 
 #. 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 ""
@@ -7384,12 +7438,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 ""
 
@@ -7544,8 +7598,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 ""
 
@@ -7663,59 +7717,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"
@@ -7723,26 +7756,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 ""
@@ -7758,27 +7797,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 ""
 
@@ -7815,256 +7854,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -8129,13 +8168,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 ""
@@ -8171,6 +8210,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 ""
diff --git a/po/sv.po b/po/sv.po
index 1851be654..2d7f9ac7a 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-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: Swedish (Sweden) (http://www.transifex.com/projects/p/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,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 ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 "Cache rensad"
 
 #. 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 "Klientupptid: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:889
+#: src/actions/actions.cpp:1041
 #, c-format
 msgid "%d week"
 msgstr "%d vecka"
 
-#: src/actions/actions.cpp:889
+#: src/actions/actions.cpp:1041
 #, c-format
 msgid "%d weeks"
 msgstr "%d veckor"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:900
+#: src/actions/actions.cpp:1052
 #, c-format
 msgid "%d day"
 msgstr "%d dag"
 
-#: src/actions/actions.cpp:900
+#: src/actions/actions.cpp:1052
 #, c-format
 msgid "%d days"
 msgstr "%d dagar"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:910
+#: src/actions/actions.cpp:1062
 #, c-format
 msgid "%d hour"
 msgstr "%d timme"
 
-#: src/actions/actions.cpp:910
+#: src/actions/actions.cpp:1062
 #, c-format
 msgid "%d hours"
 msgstr "%d timmar"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:920
+#: src/actions/actions.cpp:1072
 #, c-format
 msgid "%d minute"
 msgstr "%d minut"
 
-#: src/actions/actions.cpp:920
+#: src/actions/actions.cpp:1072
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuter"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:930
+#: src/actions/actions.cpp:1082
 #, c-format
 msgid "%d second"
 msgstr "%d sekund"
 
-#: src/actions/actions.cpp:930
+#: src/actions/actions.cpp:1082
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
 
 #. 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 "Resurs-bilder:"
 
 #. 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 "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1091
+#: src/actions/actions.cpp:1243
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
-#: 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 "Det går inte skicka tomma viskningar!"
 
 #. 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 "Gruppnamn saknas."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:333
 msgid "Guild name is missing."
 msgstr "Guild-namn saknas."
 
 #. 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 "Var vänlig specificera ett namn."
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Return toggles chat."
 msgstr "Enter för att växla chat."
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr "Meddelande stänger chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr "Enter nu, växlar chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr "Meddelande nu, stänger chat."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:107
+#: src/actions/commands.cpp:114
 #, c-format
 msgid "Player already %s!"
 msgstr "Spelare är redan %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:119
+#: src/actions/commands.cpp:127
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spelare %s lyckades!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:121
+#: src/actions/commands.cpp:129
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spelare kunde inte bli %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:160
 msgid "Player wasn't ignored!"
 msgstr "Spelaren ignorerades inte!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:161
+#: src/actions/commands.cpp:169
 msgid "Player no longer ignored!"
 msgstr "Spelaren är inte längre ignorerad!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:171
 msgid "Player could not be unignored!"
 msgstr "Spelaren kunde inte bli oignorerad!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:178
+#: src/actions/commands.cpp:186
 msgid "Player already erased!"
 msgstr "Spelare är redan borttagen!"
 
 #. 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 "Spelaren kunde inte tas bort!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:200
+#: src/actions/commands.cpp:208
 msgid "friend"
 msgstr "vän"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:215
 msgid "disregarded"
 msgstr "ignorera"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:214
+#: src/actions/commands.cpp:222
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:229
 msgid "blacklisted"
 msgstr "blacklistad"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:236
 msgid "enemy"
 msgstr "enemy"
 
@@ -287,25 +290,25 @@ msgid "Visible on map"
 msgstr "Synlig på karta"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:394
+#: src/being/being.cpp:395
 msgid "Human"
 msgstr "Människa"
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "dodge"
 msgstr "undvika"
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr "missa"
 
 #. 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 "A"
 
 #. 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 "I"
 
@@ -417,8 +420,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: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 "Fullständigt ignorera"
 
@@ -492,9 +495,9 @@ msgstr "Hjälp"
 #. 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"
@@ -545,14 +548,14 @@ msgstr "Ändrar spelserver"
 #: 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"
 
@@ -1049,7 +1052,7 @@ msgstr "Meddelande"
 #. 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 "Återuppliva"
 
@@ -1233,8 +1236,8 @@ msgstr "Skitstor (23)"
 
 #. 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 "(standard)"
 
@@ -1485,7 +1488,7 @@ msgstr "Kommentar: %s"
 
 #. 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 "Skapa Party"
 
@@ -1508,23 +1511,23 @@ 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: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
@@ -1545,7 +1548,7 @@ msgstr "Vikt: %s"
 #. 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"
@@ -1560,54 +1563,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 "Attackera"
 
 #. 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 "Viska"
 
 #. 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 "Hela"
 
 #. 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 "Kicka från guild"
 
 #. 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 "Ändra position i guild"
 
 #. 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 "Bjud in till guild"
 
 #. 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 "Nuke"
 
@@ -1625,9 +1624,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: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 "Flytta"
@@ -1636,7 +1635,7 @@ msgstr "Flytta"
 #. 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 "Prata med"
@@ -1648,9 +1647,9 @@ msgstr "Prata med"
 #. 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 "Köp"
@@ -1663,7 +1662,7 @@ msgstr "Köp"
 #. 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
@@ -1674,26 +1673,26 @@ msgstr "Sälj"
 #. 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 "Ta bort från attacklistan"
 
 #. 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 "Lägg till i prioriteringslistan för attack"
 
 #. 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 "Lägg till i attacklistan"
 
@@ -1701,19 +1700,19 @@ 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: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 "Lägg till i ignoreringslistan"
 
 #. 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 ""
 
@@ -1721,19 +1720,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 ""
 
@@ -1741,8 +1740,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
@@ -1754,7 +1753,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 ""
 
@@ -1762,44 +1761,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 "Lägg till namnet i chat"
 
 #. 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 "Spelare"
 
 #. 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 "Kicka från party"
 
 #. 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 "Pick up"
 
 #. 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 "Lägg till i chat"
 
 #. 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 "Kartobjekt"
 
 #. 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 "Ändra namn"
 
@@ -1809,20 +1808,20 @@ msgstr "Ändra namn"
 #. 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 "Ta bort"
 
 #. 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 "Warpa"
 
 #. 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 "Rör kamera"
 
@@ -1831,77 +1830,77 @@ msgstr "Rör kamera"
 #. 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 "Utstyrsel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:667
+#: src/gui/popups/popupmenu.cpp:660
 msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. 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 "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:696
+#: src/gui/popups/popupmenu.cpp:689
 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:727 src/gui/windows/npcdialog.cpp:109
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/npcdialog.cpp:109
 msgid "Clear"
 msgstr "Clear"
 
 #. 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 "Inaktivera highlight"
 
 #. 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 "Aktivera highlight"
 
 #. 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 "Ta inte bort namn"
 
 #. 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 "Ta bort namn"
 
 #. 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 "Aktivera away"
 
 #. 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 "Avaktivera away"
 
 #. 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 "Lämna"
 
@@ -1911,79 +1910,71 @@ msgstr "Lämna"
 #. 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 "Kopiera till clipboard"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:893
+#: src/gui/popups/popupmenu.cpp:887
 msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. 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 "Döp om kartskyltar       "
 
 #. 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 "Namn:                    "
 
-#: 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 "Lägg till för trade"
 
-#. 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 "Lägg till 10 för trade"
 
-#. 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 "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:2110
+#: src/gui/popups/popupmenu.cpp:1659
 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:2113
+#: src/gui/popups/popupmenu.cpp:1663
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -1992,64 +1983,48 @@ msgstr "Lägg till alla för trade"
 #. 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 "Lagra"
 
-#. 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 "Lagra 10"
 
-#. 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 "Lagra hälften"
 
-#. 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 "Lagra alla-1"
 
-#. 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 "Lagra alla"
 
 #. 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 "Ta emot"
 
-#. 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 "Hämta ut 10"
 
-#. 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 "Hämta ut hälften"
 
-#. 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 "Hämta ut alla-1"
 
-#. 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 "Hämta ut alla"
 
@@ -2059,9 +2034,9 @@ msgstr "Hämta ut alla"
 #. 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
@@ -2069,41 +2044,41 @@ msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2307
+#: src/gui/popups/popupmenu.cpp:1865
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. 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 "Döjl"
 
 #. 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 "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2413
+#: src/gui/popups/popupmenu.cpp:1971
 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:2417 src/gui/windows/statuswindow.cpp:93
+#: src/gui/popups/popupmenu.cpp:1975 src/gui/windows/statuswindow.cpp:93
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. 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 "Flytta upp"
 
 #. 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 "Flytta ner"
 
@@ -2111,155 +2086,155 @@ msgstr "Flytta ner"
 #. 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 "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2130
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2575
+#: src/gui/popups/popupmenu.cpp:2133
 msgid "Paste"
 msgstr "Klistra in"
 
 #. 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 "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2611
+#: src/gui/popups/popupmenu.cpp:2169
 msgid "Show window"
 msgstr "Visa fönster"
 
 #. 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 "Ignorera"
 
 #. 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 "Ignorera"
 
 #. 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 "Black list"
 
 #. 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 "Sätt som enemy"
 
 #. 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 "Ta bort"
 
 #. 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 "Bli vän"
 
 #. 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 "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:2351
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2355
 msgid "Imitation"
 msgstr "Imitation"
 
 #. 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 "Köp (?)"
 
 #. 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 "Sälj (?)"
 
 #. 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 "Bjud in till party"
 
-#: 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 "Visa Items"
 
 #. 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 "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:2488
 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:2979
+#: src/gui/popups/popupmenu.cpp:2537
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. 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 "Skydda item"
 
 #. 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 "Släng..."
 
 #. 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 "Släng allt"
 
@@ -2267,50 +2242,43 @@ msgstr "Släng allt"
 #. 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 "Släng"
 
 #. 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 "Dela"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:3044
+#: src/gui/popups/popupmenu.cpp:2595
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3052
+#: src/gui/popups/popupmenu.cpp:2603
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:3057
+#: src/gui/popups/popupmenu.cpp:2608
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:3060
+#: src/gui/popups/popupmenu.cpp:2611
 msgid "Goto"
 msgstr "Goto"
 
 #. 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 "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:3071
+#: src/gui/popups/popupmenu.cpp:2622
 msgid "Kick"
 msgstr "Sparka"
 
@@ -2358,8 +2326,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 "Annat"
 
@@ -2597,7 +2566,7 @@ msgstr "Level: %u"
 
 #. 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"
@@ -2619,7 +2588,7 @@ msgstr "Öppna url"
 #. 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
@@ -2632,7 +2601,7 @@ msgstr "Avsluta"
 #. 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
@@ -2645,7 +2614,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
@@ -2657,7 +2626,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"
@@ -2665,8 +2634,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 "Pris: %s / Totalt: %s"
@@ -3858,7 +3827,7 @@ msgstr "Aktivera vikt-notationer"
 #. 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"
 
@@ -3987,7 +3956,7 @@ msgstr "Aktivera inputs-logg"
 
 #. 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 ""
 
@@ -4914,7 +4883,7 @@ msgstr "EQU"
 #. 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"
 
@@ -4925,8 +4894,8 @@ msgstr "INV"
 
 #. 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"
 
@@ -5067,19 +5036,19 @@ msgid "Result"
 msgstr "Resultat"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:167
+#: src/gui/windows/buydialog.cpp:169
 msgid "Create items"
 msgstr "Skapa items"
 
 #. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:249
+#: src/gui/windows/buydialog.cpp:251
 msgid "Amount:"
 msgstr "Antal:"
 
 #. 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"
@@ -5167,7 +5136,7 @@ msgid "The new password entries mismatch."
 msgstr "Det nya lösenordet matchar inte."
 
 #. TRANSLATORS: char create dialog name
-#: src/gui/windows/charcreatedialog.cpp:75
+#: src/gui/windows/charcreatedialog.cpp:77
 msgid "New Character"
 msgstr "Ny karaktär"
 
@@ -5175,7 +5144,7 @@ msgstr "Ny karaktär"
 #. 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:"
@@ -5185,11 +5154,11 @@ msgstr "Namn:"
 #. 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 ">"
@@ -5198,72 +5167,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 "Hårfärg:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:98
+#: src/gui/windows/charcreatedialog.cpp:100
 msgid "Hair style:"
 msgstr "Hårstil:"
 
 #. 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 "Man"
 
 #. 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 "Kvinna"
 
 #. 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 "Vänligen distribuera %d poäng"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:195
+#: src/gui/windows/charcreatedialog.cpp:197
 msgid "Race:"
 msgstr "Race:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Look:"
 msgstr "Utseende:"
 
 #. 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 "Ditt namn måste vara minst 4 tecken långt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "Karaktär-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 "Vänligen ta bort %d poäng"
@@ -5306,8 +5275,8 @@ msgstr "Spela"
 #. 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"
 
@@ -5376,7 +5345,7 @@ msgid "Whispering to %s: %s"
 msgstr "Viskar till %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 ""
@@ -5493,7 +5462,7 @@ msgstr "Viste du att..."
 #. 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
@@ -5504,6 +5473,11 @@ msgstr "Viste du att..."
 msgid "Equip"
 msgstr "Equip"
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr "Dela"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5988,11 +5962,11 @@ msgstr "Visa länkar i annonseringen"
 
 #. 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 "Efterfråga 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 "%s vill %s %s, accepterar du?"
@@ -6041,111 +6015,111 @@ msgid "Invite"
 msgstr "Bjud in"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:275
+#: src/gui/windows/socialwindow.cpp:276
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accepterad party-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:286
+#: src/gui/windows/socialwindow.cpp:287
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Nekad party-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:303
+#: src/gui/windows/socialwindow.cpp:304
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accepterad guild-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:317
+#: src/gui/windows/socialwindow.cpp:318
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Nekad guild-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:357
+#: src/gui/windows/socialwindow.cpp:358
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Skapar guilden %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:378
+#: src/gui/windows/socialwindow.cpp:379
 #, c-format
 msgid "Creating party called %s."
 msgstr "Skapar partyt %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:393
+#: src/gui/windows/socialwindow.cpp:394
 msgid "Guild Name"
 msgstr "Guild-namn"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:395
+#: src/gui/windows/socialwindow.cpp:396
 msgid "Choose your guild's name."
 msgstr "Välj ditt guild-namn."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:411
+#: src/gui/windows/socialwindow.cpp:412
 msgid "Received guild request, but one already exists."
 msgstr "Tog emot guild-request, då ett redan existerar."
 
 #. 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 "%s har bjudit in dig att joina guilden %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:426
+#: src/gui/windows/socialwindow.cpp:427
 msgid "Accept Guild Invite"
 msgstr "Acceptera Guild-inbjudningar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:442
+#: src/gui/windows/socialwindow.cpp:444
 msgid "Received party request, but one already exists."
 msgstr "Tog emot party-request, även om ett redan existerar."
 
 #. 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 "Du har blivit inbjuden att joina ett party."
 
 #. 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 "Du har blivit inbjuden att joina %s party."
 
 #. 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 har bjudit in dig att joina deras 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 har bjudit in dig att joina %s party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "Acceptera 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 "Kan inte skapa party. Du är redan i ett party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:509
+#: src/gui/windows/socialwindow.cpp:512
 msgid "Party Name"
 msgstr "Party-namn"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:511
+#: src/gui/windows/socialwindow.cpp:514
 msgid "Choose your party's name."
 msgstr "Välj ditt party-namn."
 
@@ -6294,12 +6268,12 @@ msgid "You give:"
 msgstr "Du ger:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
 #. 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 "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i fönstret."
@@ -6320,27 +6294,27 @@ msgstr "Uppdaterar..."
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: 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 Uppdateringsprocessen är inte fullständig."
 
 #. 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 Det är starkt rekommenderat att"
 
 #. 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 "##1 du försöker senare igen."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1019
+#: src/gui/windows/updaterwindow.cpp:1020
 msgid "Completed"
 msgstr "Färdig"
 
@@ -6741,22 +6715,22 @@ msgid "Move & selection"
 msgstr "Flytta och välj"
 
 #. 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 "Flytta upp"
 
 #. 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 "Flytta ner"
 
 #. 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 "Flytta vänster"
 
 #. 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 "Flytta höger"
 
@@ -6816,18 +6790,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
@@ -6850,286 +6862,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 "Ignorera input 1"
+msgid "Input ignore"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
-msgstr "Ignorera input 2"
+msgid "Ignore input 1"
+msgstr "Ignorera input 1"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
-msgstr "Direkt upp"
+msgid "Ignore input 2"
+msgstr "Ignorera input 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-msgid "Direct Down"
-msgstr "Direkt ner"
+msgid "Direction keys"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
-msgid "Direct Left"
-msgstr "Direkt vänster"
+msgid "Player direct up"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-msgid "Direct Right"
-msgstr "Direkt höger"
+msgid "Player direct down"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
+msgid "Player direct left"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:78
+msgid "Player direct right"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:84
+msgid "Pet direct up"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:90
+msgid "Pet direct down"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:96
+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 "Crazy moves"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:78
+#: src/input/pages/other.cpp:120
 msgid "Change Crazy Move mode"
 msgstr "Ändra Crazy moves-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:84
+#: src/input/pages/other.cpp:126
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Quick Drop N Items från 0 slot"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:90
+#: src/input/pages/other.cpp:132
 msgid "Quick Drop N Items"
 msgstr "Quick Drop N Items"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:96
+#: src/input/pages/other.cpp:138
 msgid "Switch Quick Drop Counter"
 msgstr "Växla Quick Drop-räknare"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:102
+#: src/input/pages/other.cpp:144
 msgid "Quick heal target or self"
 msgstr "Quick heal target or self"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:108
+#: src/input/pages/other.cpp:150
 msgid "Use #itenplz spell"
 msgstr "Använd #itenplz spell"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:114
+#: src/input/pages/other.cpp:156
 msgid "Use magic attack"
 msgstr "Använd magic attack"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:120
+#: src/input/pages/other.cpp:162
 msgid "Switch magic attack"
 msgstr "Växla magic attack"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:126
+#: src/input/pages/other.cpp:168
 msgid "Switch pvp attack"
 msgstr "Växla pvp-attack"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:132
+#: src/input/pages/other.cpp:174
 msgid "Change move type"
 msgstr "Ändra förflyttningstyp"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:138
+#: src/input/pages/other.cpp:180
 msgid "Change Attack Weapon Type"
 msgstr "Ändra Attack-vapentyp"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:144
+#: src/input/pages/other.cpp:186
 msgid "Change Attack Type"
 msgstr "Ändra attacktyp"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:150
+#: src/input/pages/other.cpp:192
 msgid "Change Follow mode"
 msgstr "Ändra Follow-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:156
+#: src/input/pages/other.cpp:198
 msgid "Change Imitation mode"
 msgstr "Ändra Imitation-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:162
+#: src/input/pages/other.cpp:204
 msgid "Disable / Enable Game modifier keys"
 msgstr "Avaktivera / Aktivera Game modifier-knappar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:168
+#: src/input/pages/other.cpp:210
 msgid "On / Off audio"
 msgstr "Ljud På / Av"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:174
+#: src/input/pages/other.cpp:216
 msgid "Enable / Disable away mode"
 msgstr "Aktivera / Avaktivera away-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:180
+#: src/input/pages/other.cpp:222
 msgid "Emulate right click from keyboard"
 msgstr "Efterlikna högerklick från tangentbord"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/other.cpp:186
+#: src/input/pages/other.cpp:228
 msgid "Toggle camera mode"
 msgstr "Växla kameraläge"
 
 #. 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 "Visa onscreen-tangentbord"
 
 #. 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 "Klädsel-knappar"
@@ -7384,12 +7438,12 @@ msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:302
+#: src/inventory.cpp:304
 msgid "Storage"
 msgstr "Storage"
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:307
+#: src/inventory.cpp:309
 msgid "Cart"
 msgstr "Cart"
 
@@ -7544,8 +7598,8 @@ 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: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 "Fel namn."
 
@@ -7663,59 +7717,38 @@ msgid "Guild castle: %s"
 msgstr "Guild slott: %s"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
-msgid "Account was not found. Please re-login."
-msgstr "Kontot hittades inte. Vänligen logga ut och logga in igen."
-
-#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
-msgid "Old password incorrect."
-msgstr "Gamla lösenordet är felaktigt."
-
-#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166
-msgid "New password too short."
-msgstr "Det nya lösenordet är för kort."
-
-#. 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 "Okänt fel."
-
-#. 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 "Oregistrerat ID."
 
 #. 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 "Fel lösenord."
 
 #. 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 "Kotot har löpt ut ur tid."
 
 #. 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 "Nekad från servern."
 
 #. 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 "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
 
 #. 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 "Klienten är uråldrig."
 
 #. 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"
@@ -7723,26 +7756,32 @@ 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:275 src/net/eathena/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:239 src/net/eathena/loginhandler.cpp:208
 msgid "Server overpopulated."
 msgstr "Servern är överbefolkad."
 
 #. 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 "Detta användarnamn är redan taget."
 
 #. 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 "Felaktig epost."
 
 #. 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 "Användarnamnet är permanent raderat."
 
 #. 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 "Okänt fel."
+
+#. TRANSLATORS: error message
 #: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr "Tom adress given till Network::connect()!"
@@ -7758,27 +7797,27 @@ msgid "Connection to server terminated. "
 msgstr "Anslutningen till servern avslutad. "
 
 #. 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 ""
 
@@ -7815,256 +7854,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 "Strength %s"
 
 #. 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 "Agility %s"
 
 #. 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 "Vitality %s"
 
 #. 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 "Intelligence %s"
 
 #. 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 "Dexterity %s"
 
 #. 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 "Luck %s"
 
 #. 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 "Inga servrar tillgängliga."
 
 #. 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 "Någon annan försöker använda detta konto."
 
 #. 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 "Detta konto är redan inloggat."
 
 #. 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 "Speed hack upptäckt."
 
-#: 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 "Duplicerad Inloggning."
 
-#: 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 "Okänt anslutningsfel."
 
-#: 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 "Du blev frånkopplad från servern!"
 
 #. 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 "Defense"
 
 #. 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 "M.Attack"
 
 #. 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 "M.Defense"
 
 #. 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 "% Accuracy"
 
 #. 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 "% Evade"
 
 #. 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 "% Critical Hit"
 
 #. 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 "Attack Delay"
 
 #. 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 "Walk Delay"
 
 #. 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 "Attack Range"
 
 #. 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 "Damage per sec."
 
-#: 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 ""
 
@@ -8129,13 +8168,13 @@ msgid "Huh? What's that?"
 msgstr "Huh? Vad är det?"
 
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:87
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Trade: Du och %s"
 
 #. 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 vill trade:a med dig, accepterar du?"
@@ -8171,6 +8210,21 @@ msgid "Luck:"
 msgstr "Luck:"
 
 #. TRANSLATORS: error message
+#: src/net/tmwa/loginhandler.cpp:274
+msgid "Account was not found. Please re-login."
+msgstr "Kontot hittades inte. Vänligen logga ut och logga in igen."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/loginhandler.cpp:278
+msgid "Old password incorrect."
+msgstr "Gamla lösenordet är felaktigt."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/loginhandler.cpp:282
+msgid "New password too short."
+msgstr "Det nya lösenordet är för kort."
+
+#. TRANSLATORS: error message
 #: src/net/tmwa/skillhandler.cpp:190
 msgid "Trade failed!"
 msgstr "Trade misslyckades!"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index da2ae6d48..9905deefd 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-11 10:00+0000\n"
+"PO-Revision-Date: 2014-12-29 09:57+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"
@@ -6806,57 +6806,48 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "Visa spelar-popups"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "Flytta ner"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "Flytta vänster"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "Flytta höger"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
-#, fuzzy
 msgid "Move player forward"
-msgstr "Hemplatskant"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "Flytta upp"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "Flytta ner"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "Flytta vänster"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "Flytta höger"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6894,9 +6885,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "Av-ignorera"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6910,9 +6900,8 @@ msgstr "Ignorera input 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "Direkt ner"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6921,45 +6910,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "Spelare träffar monster"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "Direkt vänster"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "Direkt höger"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "Direkt upp"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "Direkt ner"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "Direkt vänster"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "Direkt höger"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7208,9 +7190,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "Återställ statistik"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/te.po b/po/te.po
index 3d4328511..d0528f7fa 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-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: Telugu (http://www.transifex.com/projects/p/manaplus/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,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 ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 "సరే"
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr ""
 
 #. 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 ""
 
@@ -417,8 +420,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 ""
 
@@ -492,9 +495,9 @@ msgstr "సహాయం"
 #. 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"
@@ -545,14 +548,14 @@ msgstr ""
 #: 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 "పొరపాటు"
 
@@ -1049,7 +1052,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 ""
 
@@ -1233,8 +1236,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 ""
 
@@ -1485,7 +1488,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 ""
 
@@ -1508,23 +1511,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
@@ -1545,7 +1548,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 ""
@@ -1560,54 +1563,50 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
@@ -1625,9 +1624,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 ""
@@ -1636,7 +1635,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 ""
@@ -1648,9 +1647,9 @@ msgstr ""
 #. 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 ""
@@ -1663,7 +1662,7 @@ msgstr ""
 #. 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
@@ -1674,26 +1673,26 @@ msgstr ""
 #. 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 ""
 
@@ -1701,19 +1700,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 ""
 
@@ -1721,19 +1720,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 ""
 
@@ -1741,8 +1740,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
@@ -1754,7 +1753,7 @@ msgstr ""
 
 #. 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 ""
 
@@ -1762,44 +1761,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 "ఆటగాళ్ళు"
 
 #. 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 ""
 
@@ -1809,20 +1808,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 ""
 
@@ -1831,77 +1830,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 ""
 
@@ -1911,79 +1910,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 ""
 
@@ -1992,64 +1983,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 ""
 
-#. 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 ""
 
-#. 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 ""
 
@@ -2059,9 +2034,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
@@ -2069,41 +2044,41 @@ msgid "Use"
 msgstr ""
 
 #. 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 ""
 
@@ -2111,155 +2086,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 ""
 
@@ -2267,50 +2242,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 ""
 
 #. 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 ""
-
-#. 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 ""
 
@@ -2358,8 +2326,9 @@ msgstr ""
 #: 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 ""
 
@@ -2597,7 +2566,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"
@@ -2619,7 +2588,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
@@ -2632,7 +2601,7 @@ msgstr "నిష్క్రమించు"
 #. 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
@@ -2645,7 +2614,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
@@ -2657,7 +2626,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"
@@ -2665,8 +2634,8 @@ msgstr "గరిష్ఠ"
 
 #. 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 "వెల: %s / మొత్తం: %s"
@@ -3858,7 +3827,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 ""
 
@@ -3987,7 +3956,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 ""
 
@@ -4914,7 +4883,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 ""
 
@@ -4925,8 +4894,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 ""
 
@@ -5067,19 +5036,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"
@@ -5167,7 +5136,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 ""
 
@@ -5175,7 +5144,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:"
@@ -5185,11 +5154,11 @@ 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: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 ""
@@ -5198,72 +5167,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 "పురుషుడు"
 
 #. 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 "స్త్రీ"
 
 #. 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 ""
 
 #. 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 "మీ పేరు కనీసం 4 అక్షరాల పొడవుండాలి."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr ""
 
 #. 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 ""
@@ -5306,8 +5275,8 @@ msgstr ""
 #. 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 ""
 
@@ -5376,7 +5345,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. 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 ""
@@ -5493,7 +5462,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
@@ -5504,6 +5473,11 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5988,11 +5962,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 ""
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6041,111 +6015,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr ""
 
-#: 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 ""
 
@@ -6294,12 +6268,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr ""
 
 #. 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 ""
@@ -6320,27 +6294,27 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6741,22 +6715,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6816,18 +6790,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
@@ -6850,286 +6862,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"
+msgid "Input ignore"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
+msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
+msgid "Ignore input 2"
 msgstr ""
 
 #. 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 ""
@@ -7384,12 +7438,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 ""
 
@@ -7544,8 +7598,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 ""
 
@@ -7663,59 +7717,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"
@@ -7723,26 +7756,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 ""
@@ -7758,27 +7797,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 ""
 
@@ -7815,256 +7854,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -8129,13 +8168,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 ""
@@ -8171,6 +8210,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 ""
diff --git a/po/th.po b/po/th.po
index 8f11b37fb..8ff36d2fa 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-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: Thai (http://www.transifex.com/projects/p/manaplus/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:131
+#: src/actions/actions.cpp:139
 msgid "File uploaded"
 msgstr ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr ""
 
 #. 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 ""
 
@@ -416,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: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 ""
 
@@ -491,9 +494,9 @@ msgstr ""
 #. 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"
@@ -544,14 +547,14 @@ msgstr ""
 #: 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 "ผิดพลาด"
 
@@ -1048,7 +1051,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 ""
 
@@ -1232,8 +1235,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 ""
 
@@ -1484,7 +1487,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 ""
 
@@ -1507,23 +1510,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
@@ -1544,7 +1547,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 ""
@@ -1559,54 +1562,50 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
@@ -1624,9 +1623,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 ""
@@ -1635,7 +1634,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 ""
@@ -1647,9 +1646,9 @@ msgstr ""
 #. 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 "ซื้อ"
@@ -1662,7 +1661,7 @@ msgstr "ซื้อ"
 #. 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
@@ -1673,26 +1672,26 @@ msgstr ""
 #. 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 ""
 
@@ -1700,19 +1699,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 ""
 
@@ -1720,19 +1719,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 ""
 
@@ -1740,8 +1739,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
@@ -1753,7 +1752,7 @@ msgstr ""
 
 #. 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 ""
 
@@ -1761,44 +1760,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 ""
 
 #. 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 ""
 
@@ -1808,20 +1807,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 ""
 
@@ -1830,77 +1829,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 ""
 
@@ -1910,79 +1909,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 ""
 
@@ -1991,64 +1982,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 ""
 
-#. 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 ""
 
-#. 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 ""
 
@@ -2058,9 +2033,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
@@ -2068,41 +2043,41 @@ msgid "Use"
 msgstr "ใช้"
 
 #. 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 ""
 
@@ -2110,155 +2085,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 ""
 
@@ -2266,50 +2241,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 "ทิ้ง"
 
 #. 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 ""
-
-#. 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 ""
 
@@ -2357,8 +2325,9 @@ msgstr ""
 #: 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 ""
 
@@ -2596,7 +2565,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"
@@ -2618,7 +2587,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
@@ -2631,7 +2600,7 @@ msgstr "ออก"
 #. 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
@@ -2644,7 +2613,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
@@ -2656,7 +2625,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"
@@ -2664,8 +2633,8 @@ msgstr ""
 
 #. 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 ""
@@ -3857,7 +3826,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 ""
 
@@ -3986,7 +3955,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 ""
 
@@ -4913,7 +4882,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 ""
 
@@ -4924,8 +4893,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 ""
 
@@ -5066,19 +5035,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"
@@ -5166,7 +5135,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 ""
 
@@ -5174,7 +5143,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:"
@@ -5184,11 +5153,11 @@ 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: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 ""
@@ -5197,72 +5166,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 "ชาย"
 
 #. 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 "หญิง"
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr ""
 
 #. 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 ""
@@ -5305,8 +5274,8 @@ msgstr ""
 #. 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 ""
 
@@ -5375,7 +5344,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. 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 ""
@@ -5492,7 +5461,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
@@ -5503,6 +5472,11 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5985,11 +5959,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 ""
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6038,111 +6012,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr ""
 
-#: 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 ""
 
@@ -6291,12 +6265,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr ""
 
 #. 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 ""
@@ -6317,27 +6291,27 @@ msgstr ""
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6738,22 +6712,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6813,18 +6787,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
@@ -6847,286 +6859,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"
+msgid "Input ignore"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
+msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
+msgid "Ignore input 2"
 msgstr ""
 
 #. 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 ""
@@ -7381,12 +7435,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 ""
 
@@ -7541,8 +7595,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 ""
 
@@ -7660,59 +7714,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"
@@ -7720,26 +7753,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 ""
@@ -7755,27 +7794,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 ""
 
@@ -7812,256 +7851,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -8126,13 +8165,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 ""
@@ -8168,6 +8207,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 ""
diff --git a/po/tr.po b/po/tr.po
index 5ded46252..474f9ede5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-11 10:00+0000\n"
+"PO-Revision-Date: 2014-12-29 09:57+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
 "language/tr/)\n"
@@ -6797,27 +6797,23 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "Oyuncu açılır pencerelerini göster"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "Aşağı Taşı"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "Sola Taşı"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "Sağa Taşı"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
@@ -6826,27 +6822,23 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "Sola Taşı"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "Aşağı Taşı"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "Sola Taşı"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "Sağa Taşı"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6884,9 +6876,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "Görmezden gelmeyi bırak"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6900,9 +6891,8 @@ msgstr "Görmezden gel giriş 2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "Aşağı Yönlen"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6911,45 +6901,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "Oyuncu Konumu:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "Sola Yönlen"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "Sağa Yönlen"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "Yukarı Yönlen"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "Aşağı Yönlen"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "Sola Yönlen"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "Sağa Yönlen"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7198,9 +7181,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "İstatistikleri sıfırla"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/uk.po b/po/uk.po
new file mode 100644
index 000000000..a3f5be304
--- /dev/null
+++ b/po/uk.po
@@ -0,0 +1,8882 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# tivasyk <tivasyk@gmail.com>, 2010
+# William Lee <v4r@trioptimum.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2014-12-28 19:54+0300\n"
+"PO-Revision-Date: 2014-12-29 16:44+0000\n"
+"Last-Translator: William Lee <v4r@trioptimum.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/manaplus/language/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. TRANSLATORS: file uploaded message
+#: src/actions/actions.cpp:139
+msgid "File uploaded"
+msgstr "Файл завантажено"
+
+#. TRANSLATORS: ok dialog button
+#. TRANSLATORS: edit dialog label
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: ok dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: ok dialog button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: ok dialog button
+#: 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
+#: src/gui/widgets/tabs/setup_theme.cpp:343
+#: src/gui/widgets/tabs/setup_video.cpp:248
+#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:387
+#: 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: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: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:541
+#: src/net/eathena/charserverhandler.cpp:571
+msgid "OK"
+msgstr "ОК"
+
+#. TRANSLATORS: clear graphics command message
+#. TRANSLATORS: clear fonts cache message
+#: src/actions/actions.cpp:890 src/actions/actions.cpp:902
+msgid "Cache cleaned"
+msgstr "Кеш прибрано"
+
+#. TRANSLATORS: uptime command
+#: src/actions/actions.cpp:1030 src/actions/actions.cpp:1086
+#, c-format
+msgid "Client uptime: %s"
+msgstr "Час безперервної роботи клієнта: %s"
+
+#. TRANSLATORS: uptime command
+#: src/actions/actions.cpp:1041
+#, c-format
+msgid "%d week"
+msgstr "%d тиждень"
+
+#: src/actions/actions.cpp:1041
+#, c-format
+msgid "%d weeks"
+msgstr "%d тижнів"
+
+#. TRANSLATORS: uptime command
+#: src/actions/actions.cpp:1052
+#, c-format
+msgid "%d day"
+msgstr "%d день"
+
+#: src/actions/actions.cpp:1052
+#, c-format
+msgid "%d days"
+msgstr "%d днів"
+
+#. TRANSLATORS: uptime command
+#: src/actions/actions.cpp:1062
+#, c-format
+msgid "%d hour"
+msgstr "%d година"
+
+#: src/actions/actions.cpp:1062
+#, c-format
+msgid "%d hours"
+msgstr "%d годин"
+
+#. TRANSLATORS: uptime command
+#: src/actions/actions.cpp:1072
+#, c-format
+msgid "%d minute"
+msgstr "%d хвилина"
+
+#: src/actions/actions.cpp:1072
+#, c-format
+msgid "%d minutes"
+msgstr "%d хвилин"
+
+#. TRANSLATORS: uptime command
+#: src/actions/actions.cpp:1082
+#, c-format
+msgid "%d second"
+msgstr "%d секунда"
+
+#: src/actions/actions.cpp:1082
+#, c-format
+msgid "%d seconds"
+msgstr "%d секунд"
+
+#. TRANSLATORS: dump command
+#: src/actions/actions.cpp:1143 src/actions/actions.cpp:1152
+msgid "Resource images:"
+msgstr "Зображень:"
+
+#. TRANSLATORS: dump command
+#: src/actions/actions.cpp:1146 src/actions/actions.cpp:1155
+msgid "Resource orphaned images:"
+msgstr "Вилучених зображень:"
+
+#. TRANSLATORS: dump environment command
+#: src/actions/actions.cpp:1243
+msgid "Environment variables dumped"
+msgstr "Змінні середовища збережені"
+
+#: src/actions/actions.cpp:1362
+msgid "Uploaded config into:"
+msgstr "Завантажений конфіг:"
+
+#: src/actions/actions.cpp:1371
+msgid "Uploaded server config into:"
+msgstr "Завантажена конфігурація сервера:"
+
+#: src/actions/actions.cpp:1380
+msgid "Uploaded log into:"
+msgstr "Завантажений лог:"
+
+#. TRANSLATORS: whisper send
+#: src/actions/chat.cpp:242
+msgid "Cannot send empty whispers!"
+msgstr "Чи ж можна говорити без слів?"
+
+#. TRANSLATORS: new whisper or channel query
+#: src/actions/chat.cpp:290
+#, c-format
+msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
+msgstr "Неможливо створити вкладку для спілкування з гравцем \"%s\" - або така вже існує, або ви намагаєтесь перешіптуватись сам із собою :P ."
+
+#. TRANSLATORS: create party message
+#. TRANSLATORS: chat error message
+#: src/actions/chat.cpp:315 src/gui/widgets/tabs/chat/partytab.cpp:71
+msgid "Party name is missing."
+msgstr "Не вистачає назви групи."
+
+#. TRANSLATORS: create guild message
+#: 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: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:401
+msgid "Return toggles chat."
+msgstr "Enter перемикає на чат."
+
+#: src/actions/chat.cpp:401
+msgid "Message closes chat."
+msgstr "Повідомлення закриває вікно чату."
+
+#. TRANSLATORS: message from toggle chat command
+#: src/actions/chat.cpp:412
+msgid "Return now toggles chat."
+msgstr "Enter тепер перемикає на вікно чату."
+
+#. TRANSLATORS: message from toggle chat command
+#: src/actions/chat.cpp:421
+msgid "Message now closes chat."
+msgstr "Тепер повідомлення закриватиме вікно чату."
+
+#. TRANSLATORS: change relation
+#: src/actions/commands.cpp:114
+#, c-format
+msgid "Player already %s!"
+msgstr "Гравця все позначено як \"%s\"!"
+
+#. TRANSLATORS: change relation
+#: src/actions/commands.cpp:127
+#, c-format
+msgid "Player successfully %s!"
+msgstr "Гравця позначено як \"%s\"!"
+
+#. TRANSLATORS: change relation
+#: src/actions/commands.cpp:129
+#, c-format
+msgid "Player could not be %s!"
+msgstr "Неможливо позначити гравця як \"%s\"!"
+
+#. TRANSLATORS: unignore command
+#: src/actions/commands.cpp:160
+msgid "Player wasn't ignored!"
+msgstr "Гравець не ігнорувався!"
+
+#. TRANSLATORS: unignore command
+#: src/actions/commands.cpp:169
+msgid "Player no longer ignored!"
+msgstr "Гравець більше не ігнорується!"
+
+#. TRANSLATORS: unignore command
+#: src/actions/commands.cpp:171
+msgid "Player could not be unignored!"
+msgstr "Не можна видалити цього гравця зі списку ігнорованих!"
+
+#. TRANSLATORS: erase command
+#: src/actions/commands.cpp:186
+msgid "Player already erased!"
+msgstr "Гравець все стертий!"
+
+#. TRANSLATORS: erase command
+#: src/actions/commands.cpp:199
+msgid "Player no longer erased!"
+msgstr "Гравця повернуто із порожнечі!"
+
+#. TRANSLATORS: erase command
+#: src/actions/commands.cpp:201
+msgid "Player could not be erased!"
+msgstr "Не можна повернути цього стертого гравця!"
+
+#. TRANSLATORS: adding friend command
+#: src/actions/commands.cpp:208
+msgid "friend"
+msgstr "приятель"
+
+#. TRANSLATORS: disregard command
+#: src/actions/commands.cpp:215
+msgid "disregarded"
+msgstr "зневажити"
+
+#. TRANSLATORS: neutral command
+#: src/actions/commands.cpp:222
+msgid "neutral"
+msgstr "нейтральний"
+
+#. TRANSLATORS: blacklist command
+#: src/actions/commands.cpp:229
+msgid "blacklisted"
+msgstr "чорний список"
+
+#. TRANSLATORS: enemy command
+#: src/actions/commands.cpp:236
+msgid "enemy"
+msgstr "супротивник"
+
+#. TRANSLATORS: disable trades message
+#: src/actions/statusbar.cpp:171
+msgid "Ignoring incoming trade requests"
+msgstr "Ігнорування вхідних пропозицій торгівлі"
+
+#. TRANSLATORS: enable trades message
+#: src/actions/statusbar.cpp:181
+msgid "Accepting incoming trade requests"
+msgstr "Приймання вхідних пропозицій торгівлі"
+
+#. TRANSLATORS: visible beings on map
+#: src/actormanager.cpp:1323
+msgid "Visible on map"
+msgstr "Видимий на мапі"
+
+#. TRANSLATORS: default race name
+#: src/being/being.cpp:395
+msgid "Human"
+msgstr "Людина"
+
+#: src/being/being.cpp:564
+msgid "dodge"
+msgstr "ухилення"
+
+#: src/being/being.cpp:564
+msgid "miss"
+msgstr "промах"
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being/being.cpp:1895 src/gui/windows/whoisonline.cpp:855
+msgid "A"
+msgstr "A"
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:860
+msgid "I"
+msgstr "I"
+
+#. TRANSLATORS: chat message after death
+#: src/being/localplayer.cpp:380
+#, c-format
+msgid "You were killed by %s."
+msgstr "Вас вбив %s."
+
+#. TRANSLATORS: pickup error message
+#: src/being/localplayer.cpp:825
+msgid "Tried to pick up nonexistent item."
+msgstr "Спроби підняти неіснуючий предмет."
+
+#. TRANSLATORS: pickup error message
+#: src/being/localplayer.cpp:829
+msgid "Item is too heavy."
+msgstr "Предмет занадто важкий."
+
+#. TRANSLATORS: pickup error message
+#: src/being/localplayer.cpp:833
+msgid "Item is too far away."
+msgstr "Предмет задалеко щоб підняти."
+
+#. TRANSLATORS: pickup error message
+#: src/being/localplayer.cpp:837
+msgid "Inventory is full."
+msgstr "В сумці немає місця."
+
+#. TRANSLATORS: pickup error message
+#: src/being/localplayer.cpp:841
+msgid "Stack is too big."
+msgstr "Забагато предметів у купі."
+
+#. TRANSLATORS: pickup error message
+#: src/being/localplayer.cpp:845
+msgid "Item belongs to someone else."
+msgstr "Предмет належить комусь іншому."
+
+#. TRANSLATORS: pickup error message
+#: src/being/localplayer.cpp:849
+msgid "You can't pickup this amount of items."
+msgstr "Не можливо підняти стільки предметів!"
+
+#. TRANSLATORS: pickup error message
+#: src/being/localplayer.cpp:853
+msgid "Your item stack has max amount."
+msgstr "Кількість цих предметів досягла межі."
+
+#. TRANSLATORS: pickup error message
+#: src/being/localplayer.cpp:860
+msgid "Unknown problem picking up item."
+msgstr "Невстановлена помилка під час спроби підняти предмет."
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/being/localplayer.cpp:884
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Ви підняли %d [@@%d|%s@@]."
+msgstr[1] "Ви підняли %d [@@%d|%s@@]."
+msgstr[2] "Ви підняли %d [@@%d|%s@@]."
+
+#. TRANSLATORS: this is normal experience
+#. TRANSLATORS: get xp message
+#: src/being/localplayer.cpp:1066 src/being/localplayer.cpp:1067
+#: src/being/localplayer.cpp:1103
+msgid "xp"
+msgstr "досвід"
+
+#. TRANSLATORS: this is job experience
+#: src/being/localplayer.cpp:1071 src/being/localplayer.cpp:1077
+#: src/being/localplayer.cpp:1083
+msgid "job"
+msgstr "робота"
+
+#. TRANSLATORS: follow command message
+#: src/being/localplayer.cpp:2813
+#, c-format
+msgid "Follow: %s"
+msgstr "Йти слідом за: %s"
+
+#. TRANSLATORS: follow command message
+#. TRANSLATORS: cancel follow message
+#: src/being/localplayer.cpp:2819 src/being/localplayer.cpp:2844
+msgid "Follow canceled"
+msgstr "Слідкування відмінено"
+
+#. TRANSLATORS: imitate command message
+#: src/being/localplayer.cpp:2829
+#, c-format
+msgid "Imitation: %s"
+msgstr "Імітація: %s"
+
+#. TRANSLATORS: imitate command message
+#. TRANSLATORS: cancel follow message
+#: src/being/localplayer.cpp:2835 src/being/localplayer.cpp:2849
+msgid "Imitation canceled"
+msgstr "Імітацію відмінено"
+
+#. TRANSLATORS: wait player/monster message
+#: src/being/localplayer.cpp:3199
+#, c-format
+msgid "You see %s"
+msgstr "Ти бачиш %s"
+
+#. TRANSLATORS: ignore/unignore action
+#. TRANSLATORS: popup menu item
+#. 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:2296
+#: src/gui/popups/popupmenu.cpp:2338
+msgid "Completely ignore"
+msgstr "Остаточно ігнорувати"
+
+#. TRANSLATORS: ignore/unignore action
+#: src/being/playerrelations.cpp:485
+msgid "Print '...'"
+msgstr "Виводити '...'"
+
+#. TRANSLATORS: ignore/unignore action
+#: src/being/playerrelations.cpp:508
+msgid "Blink name"
+msgstr "Блимаюче ім'я"
+
+#. TRANSLATORS: ignore strategi
+#: src/being/playerrelations.cpp:554
+msgid "Floating '...' bubble"
+msgstr "Плаваюча '...' бульбашка"
+
+#. TRANSLATORS: ignore strategi
+#: src/being/playerrelations.cpp:558
+msgid "Floating bubble"
+msgstr "Плаваюча бульбашка"
+
+#. TRANSLATORS: setup tab quick button
+#. TRANSLATORS: full button name
+#. TRANSLATORS: setup window name
+#: src/client.cpp:926 src/gui/windowmenu.cpp:166
+#: src/gui/windows/setupwindow.cpp:62
+msgid "Setup"
+msgstr "Налаштування"
+
+#. TRANSLATORS: perfoamance tab quick button
+#. TRANSLATORS: settings tab name
+#: src/client.cpp:929 src/gui/widgets/tabs/setup_perfomance.cpp:54
+msgid "Performance"
+msgstr "Продуктивність"
+
+#. TRANSLATORS: video tab quick button
+#. TRANSLATORS: video settings tab name
+#: src/client.cpp:932 src/gui/widgets/tabs/setup_video.cpp:105
+msgid "Video"
+msgstr "Відео"
+
+#. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: theme settings tab name
+#: src/client.cpp:935 src/gui/widgets/tabs/setup_theme.cpp:122
+msgid "Theme"
+msgstr "Теми"
+
+#. TRANSLATORS: theme tab quick button
+#: src/client.cpp:938
+msgid "About"
+msgstr "Про програму"
+
+#. TRANSLATORS: theme tab quick button
+#. TRANSLATORS: help window name
+#: src/client.cpp:941 src/gui/windowmenu.cpp:74
+#: src/gui/windows/helpwindow.cpp:53
+msgid "Help"
+msgstr "Довідка"
+
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close chat tab
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close window
+#. TRANSLATORS: did you know window button
+#. TRANSLATORS: storage button
+#. TRANSLATORS: npc dialog button
+#. 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: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"
+msgstr "Закрити"
+
+#. TRANSLATORS: connection dialog header
+#: src/client.cpp:1071
+msgid "Connecting to server"
+msgstr "Очікування відповіді сервера"
+
+#. TRANSLATORS: connection dialog header
+#: src/client.cpp:1119
+msgid "Logging in"
+msgstr "Авторизація..."
+
+#. TRANSLATORS: connection dialog header
+#: src/client.cpp:1162
+msgid "Entering game world"
+msgstr "Поринаємо в ігровий всесвіт..."
+
+#. TRANSLATORS: connection dialog header
+#: src/client.cpp:1292
+msgid "Requesting characters"
+msgstr "Завантаження списку персонажів..."
+
+#. TRANSLATORS: connection dialog header
+#: src/client.cpp:1332
+msgid "Connecting to the game server"
+msgstr "Приєднання до серверу..."
+
+#. TRANSLATORS: connection dialog header
+#: src/client.cpp:1344
+msgid "Changing game servers"
+msgstr "Зміна ігрового серверу..."
+
+#. TRANSLATORS: error dialog header
+#. TRANSLATORS: change email error header
+#. TRANSLATORS: change password error header
+#. TRANSLATORS: char creation error
+#. TRANSLATORS: error message
+#. TRANSLATORS: edit server dialog error header
+#. TRANSLATORS: error message
+#. TRANSLATORS: unregister dialog. error message.
+#. TRANSLATORS: error message header
+#. TRANSLATORS: error message
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: 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: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:524
+#: src/net/eathena/charserverhandler.cpp:526
+msgid "Error"
+msgstr "Помилка"
+
+#. TRANSLATORS: connection dialog header
+#: src/client.cpp:1428
+msgid "Requesting registration details"
+msgstr "Запитуємо деталі реєстрації"
+
+#. TRANSLATORS: password change message header
+#: src/client.cpp:1469
+msgid "Password Change"
+msgstr "Змінити пароль"
+
+#. TRANSLATORS: password change message text
+#: src/client.cpp:1471
+msgid "Password changed successfully!"
+msgstr "Пароль змінено!"
+
+#. TRANSLATORS: email change message header
+#: src/client.cpp:1496
+msgid "Email Change"
+msgstr "Змінити імейл"
+
+#. TRANSLATORS: email change message text
+#: src/client.cpp:1498
+msgid "Email changed successfully!"
+msgstr "Імейл змінено!"
+
+#. TRANSLATORS: unregister message header
+#: src/client.cpp:1525
+msgid "Unregister Successful"
+msgstr "Акаунт видалено"
+
+#. TRANSLATORS: unregister message text
+#: src/client.cpp:1527
+msgid "Farewell, come back any time..."
+msgstr "До побачення та вертайтесь."
+
+#. TRANSLATORS: directory creation error
+#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
+#: src/dirs.cpp:488 src/dirs.cpp:496
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr "Тека %s не існує і не може бути створена! Виходимо."
+
+#. TRANSLATORS: update server initialisation error
+#: src/dirs.cpp:370
+#, c-format
+msgid "Invalid update host: %s."
+msgstr "Невідомий сервер оновлення: %s."
+
+#. TRANSLATORS: update server initialisation error
+#: src/dirs.cpp:411 src/dirs.cpp:418
+msgid "Error creating updates directory!"
+msgstr "Неможливо створити теку для оновлень!"
+
+#: src/dirs.cpp:440 src/dirs.cpp:458
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr "Помилка: тека %s не існує і не може бути створена! Виходимо."
+
+#: src/dyetool/dyemain.cpp:49
+msgid "dyecmd srcfile dyestring dstfile"
+msgstr "dyecmd файл_джерела рядок_кольору файл_призначення"
+
+#: src/dyetool/dyemain.cpp:50
+msgid "or"
+msgstr "або"
+
+#: src/dyetool/dyemain.cpp:51
+msgid "dyecmd srcdyestring dstfile"
+msgstr "dyecmd файл_рядків_кольору файл_призначення"
+
+#. TRANSLATORS: chat tab header
+#: src/game.cpp:236
+msgid "General"
+msgstr "Загальне"
+
+#. TRANSLATORS: chat tab header
+#. TRANSLATORS: full button name
+#. TRANSLATORS: debug window name
+#: src/game.cpp:254 src/gui/windowmenu.cpp:153
+#: src/gui/windows/debugwindow.cpp:42
+msgid "Debug"
+msgstr "Зневадження"
+
+#. TRANSLATORS: save file message
+#: src/game.cpp:539
+#, c-format
+msgid "Screenshot saved as %s"
+msgstr "Скріншот збережено як %s"
+
+#. TRANSLATORS: save file message
+#: src/game.cpp:549
+msgid "Saving screenshot failed!"
+msgstr "Збереження скріншоту провалилось!"
+
+#. TRANSLATORS: error message text
+#: src/game.cpp:632
+msgid "The connection to the server was lost."
+msgstr "Втрачено з'єднання з сервером."
+
+#. TRANSLATORS: error message header
+#: src/game.cpp:635
+msgid "Network Error"
+msgstr "Мережева помилка"
+
+#. TRANSLATORS: move type in status bar
+#: src/gamemodifiers.cpp:143
+msgid "(D) default moves"
+msgstr "(D) рухи за замовчуванням"
+
+#. TRANSLATORS: move type in status bar
+#: src/gamemodifiers.cpp:145
+msgid "(I) invert moves"
+msgstr "(I) інверсія рухів"
+
+#. TRANSLATORS: move type in status bar
+#: src/gamemodifiers.cpp:147
+msgid "(c) moves with some crazy moves"
+msgstr "(c) рух з малою часткою божевільних рухів"
+
+#. TRANSLATORS: move type in status bar
+#: src/gamemodifiers.cpp:149
+msgid "(C) moves with crazy moves"
+msgstr "(C) часткові божевільні рухи"
+
+#. TRANSLATORS: move type in status bar
+#: src/gamemodifiers.cpp:151
+msgid "(d) double normal + crazy"
+msgstr "(d) двічі нормальні рухи + божевільні"
+
+#. TRANSLATORS: move type in status bar
+#: src/gamemodifiers.cpp:153
+msgid "(?) unknown move"
+msgstr "(?) невідомий тип рухів"
+
+#. TRANSLATORS: crazy move type in status bar
+#: src/gamemodifiers.cpp:178
+#, c-format
+msgid "(%u) crazy move number %u"
+msgstr "(%u) божевільні рухи номер %u"
+
+#. TRANSLATORS: crazy move type in status bar
+#: src/gamemodifiers.cpp:184
+msgid "(a) custom crazy move"
+msgstr "(a) користувацькі божевільні рухи"
+
+#. TRANSLATORS: crazy move type in status bar
+#: src/gamemodifiers.cpp:189
+msgid "(?) crazy move"
+msgstr "(?) невідомий тип божевільних рухів"
+
+#. TRANSLATORS: move to target type in status bar
+#: src/gamemodifiers.cpp:196
+msgid "(0) default moves to target"
+msgstr "(0) нормальний рух до цілі"
+
+#. TRANSLATORS: move to target type in status bar
+#: src/gamemodifiers.cpp:198
+msgid "(1) moves to target in distance 1"
+msgstr "(1) наблизитись до цілі на відстань 1"
+
+#. TRANSLATORS: move to target type in status bar
+#: src/gamemodifiers.cpp:200
+msgid "(2) moves to target in distance 2"
+msgstr "(2) наблизитись до цілі на відстань 2"
+
+#. TRANSLATORS: move to target type in status bar
+#: src/gamemodifiers.cpp:202
+msgid "(3) moves to target in distance 3"
+msgstr "(3) наблизитись до цілі на відстань 3"
+
+#. TRANSLATORS: move to target type in status bar
+#: src/gamemodifiers.cpp:204
+msgid "(4) moves to target in distance 4"
+msgstr "(4) наблизитись до цілі на відстань 4"
+
+#. TRANSLATORS: move to target type in status bar
+#: src/gamemodifiers.cpp:206
+msgid "(5) moves to target in distance 5"
+msgstr "(5) наблизитись до цілі на відстань 5"
+
+#. TRANSLATORS: move to target type in status bar
+#: src/gamemodifiers.cpp:208
+msgid "(6) moves to target in distance 6"
+msgstr "(6) наблизитись до цілі на відстань 6"
+
+#. TRANSLATORS: move to target type in status bar
+#: src/gamemodifiers.cpp:210
+msgid "(7) moves to target in distance 7"
+msgstr "(7) наблизитись до цілі на відстань 7"
+
+#. TRANSLATORS: move to target type in status bar
+#: src/gamemodifiers.cpp:212
+msgid "(8) moves to target in distance 8"
+msgstr "(8) наблизитись до цілі на відстань 8"
+
+#. TRANSLATORS: move to target type in status bar
+#: src/gamemodifiers.cpp:214
+msgid "(9) moves to target in distance 9"
+msgstr "(9) наблизитись до цілі на відстань 9"
+
+#. TRANSLATORS: move to target type in status bar
+#: src/gamemodifiers.cpp:216
+msgid "(A) moves to target in attack range"
+msgstr "(A) наблизитись до цілі на відстань атаки"
+
+#. TRANSLATORS: move to target type in status bar
+#: src/gamemodifiers.cpp:218
+msgid "(a) archer attack range"
+msgstr "(a) стрілецька відстань до цілі"
+
+#. TRANSLATORS: move to target type in status bar
+#: src/gamemodifiers.cpp:220
+msgid "(B) moves to target in attack range - 1"
+msgstr "(B) рухатись впритул до цілі"
+
+#. TRANSLATORS: move to target type in status bar
+#: src/gamemodifiers.cpp:222
+msgid "(?) move to target"
+msgstr "(?) рух до цілі"
+
+#. TRANSLATORS: folow mode in status bar
+#: src/gamemodifiers.cpp:228
+msgid "(D) default follow"
+msgstr "(D) слідкування за замочуванням"
+
+#. TRANSLATORS: folow mode in status bar
+#: src/gamemodifiers.cpp:230
+msgid "(R) relative follow"
+msgstr "(R) відносне слідкування"
+
+#. TRANSLATORS: folow mode in status bar
+#: src/gamemodifiers.cpp:232
+msgid "(M) mirror follow"
+msgstr "(M) віддзеркалене слідкування"
+
+#. TRANSLATORS: folow mode in status bar
+#: src/gamemodifiers.cpp:234
+msgid "(P) pet follow"
+msgstr "(P) побути улюбленцем"
+
+#. TRANSLATORS: folow mode in status bar
+#: src/gamemodifiers.cpp:236
+msgid "(?) unknown follow"
+msgstr "(?) невідомий режим слідкування"
+
+#. TRANSLATORS: switch attack type in status bar
+#. TRANSLATORS: attack type in status bar
+#: src/gamemodifiers.cpp:242 src/gamemodifiers.cpp:250
+#: src/gamemodifiers.cpp:264
+msgid "(?) attack"
+msgstr "(?) невідомий режим атаки"
+
+#. TRANSLATORS: switch attack type in status bar
+#. TRANSLATORS: attack type in status bar
+#: src/gamemodifiers.cpp:244 src/gamemodifiers.cpp:256
+msgid "(D) default attack"
+msgstr "(D) атака за замовчуванням"
+
+#. TRANSLATORS: switch attack type in status bar
+#: src/gamemodifiers.cpp:246
+msgid "(s) switch attack without shield"
+msgstr "(s) перемкнути атаку без щита"
+
+#. TRANSLATORS: switch attack type in status bar
+#: src/gamemodifiers.cpp:248
+msgid "(S) switch attack with shield"
+msgstr "(S) перемкнути атаку зі щитом"
+
+#. TRANSLATORS: attack type in status bar
+#: src/gamemodifiers.cpp:258
+msgid "(G) go and attack"
+msgstr "(G) наблизитись і атакувати"
+
+#. TRANSLATORS: attack type in status bar
+#: src/gamemodifiers.cpp:260
+msgid "(A) go, attack, pickup"
+msgstr "(A) наблизитись, атакувати і підняти дропи"
+
+#. TRANSLATORS: attack type in status bar
+#: src/gamemodifiers.cpp:262
+msgid "(d) without auto attack"
+msgstr "(d) без автоатаки"
+
+#. TRANSLATORS: pickup size in status bar
+#: src/gamemodifiers.cpp:297
+msgid "(S) small pick up 1x1 cells"
+msgstr "(S) піднімати в зоні 1x1"
+
+#. TRANSLATORS: pickup size in status bar
+#: src/gamemodifiers.cpp:299
+msgid "(D) default pick up 2x1 cells"
+msgstr "(D) піднімати в зоні 2x1"
+
+#. TRANSLATORS: pickup size in status bar
+#: src/gamemodifiers.cpp:301
+msgid "(F) forward pick up 2x3 cells"
+msgstr "(F) піднімати в зоні 2x3"
+
+#. TRANSLATORS: pickup size in status bar
+#: src/gamemodifiers.cpp:303
+msgid "(3) pick up 3x3 cells"
+msgstr "(3) піднімати в зоні 3x3"
+
+#. TRANSLATORS: pickup size in status bar
+#: src/gamemodifiers.cpp:305
+msgid "(g) go and pick up in distance 4"
+msgstr "(g) наблизитись і підняти в межі 4 кроків"
+
+#. TRANSLATORS: pickup size in status bar
+#: src/gamemodifiers.cpp:307
+msgid "(G) go and pick up in distance 8"
+msgstr "(G) наблизитись і підняти в межі 8 кроків"
+
+#. TRANSLATORS: pickup size in status bar
+#: src/gamemodifiers.cpp:309
+msgid "(A) go and pick up in max distance"
+msgstr "(A) наблизитись на потрібну відстань і підняти"
+
+#. TRANSLATORS: pickup size in status bar
+#: src/gamemodifiers.cpp:311
+msgid "(?) pick up"
+msgstr "(?) невідомий режим підняття"
+
+#. TRANSLATORS: magic attack in status bar
+#: src/gamemodifiers.cpp:317
+msgid "(f) use #flar for magic attack"
+msgstr "(f) магічна атака із #flar"
+
+#. TRANSLATORS: magic attack in status bar
+#: src/gamemodifiers.cpp:319
+msgid "(c) use #chiza for magic attack"
+msgstr "(c) магічна атака із #chiza"
+
+#. TRANSLATORS: magic attack in status bar
+#: src/gamemodifiers.cpp:321
+msgid "(I) use #ingrav for magic attack"
+msgstr "(I) магічна атака із #ingrav"
+
+#. TRANSLATORS: magic attack in status bar
+#: src/gamemodifiers.cpp:323
+msgid "(F) use #frillyar for magic attack"
+msgstr "(F) магічна атака із #frillyar"
+
+#. TRANSLATORS: magic attack in status bar
+#: src/gamemodifiers.cpp:325
+msgid "(U) use #upmarmu for magic attack"
+msgstr "(U) магічна атака із #upmarmu"
+
+#. TRANSLATORS: magic attack in status bar
+#: src/gamemodifiers.cpp:327
+msgid "(?) magic attack"
+msgstr "(?) невідомий тип магічної атаки"
+
+#. TRANSLATORS: player attack type in status bar
+#: src/gamemodifiers.cpp:333
+msgid "(a) attack all players"
+msgstr "(a) атакувати всіх без розбору"
+
+#. TRANSLATORS: player attack type in status bar
+#: src/gamemodifiers.cpp:335
+msgid "(f) attack all except friends"
+msgstr "(f) атакувати всіх окрім приятелів"
+
+#. TRANSLATORS: player attack type in status bar
+#: src/gamemodifiers.cpp:337
+msgid "(b) attack bad relations"
+msgstr "(b) атакувати гравців з поганими стосунками"
+
+#. TRANSLATORS: player attack type in status bar
+#: src/gamemodifiers.cpp:339
+msgid "(d) don't attack players"
+msgstr "(d) не атакувати гравців"
+
+#. TRANSLATORS: player attack type in status bar
+#: src/gamemodifiers.cpp:341
+msgid "(?) pvp attack"
+msgstr "(?) невідомий тип PVP атаки"
+
+#. TRANSLATORS: imitation type in status bar
+#: src/gamemodifiers.cpp:347
+msgid "(D) default imitation"
+msgstr "(D) імітація за замовчуванням"
+
+#. TRANSLATORS: imitation type in status bar
+#: src/gamemodifiers.cpp:349
+msgid "(O) outfits imitation"
+msgstr "(O) імітувати спорядження"
+
+#. TRANSLATORS: imitation type in status bar
+#: src/gamemodifiers.cpp:351
+msgid "(?) imitation"
+msgstr "(?) невідомий тип імітації"
+
+#. TRANSLATORS: game modifiers state in status bar
+#: src/gamemodifiers.cpp:357
+msgid "Game modifiers are enabled"
+msgstr "Клавіші Жовтого рядка активовані"
+
+#. TRANSLATORS: game modifiers state in status bar
+#: src/gamemodifiers.cpp:359
+msgid "Game modifiers are disabled"
+msgstr "Клавіші Жовтого рядка деактивовані"
+
+#. TRANSLATORS: game modifiers state in status bar
+#: src/gamemodifiers.cpp:361
+msgid "Game modifiers are unknown"
+msgstr "Невідомий стан Жовтого рядка"
+
+#. TRANSLATORS: map view type in status bar
+#: src/gamemodifiers.cpp:374
+msgid "(N) normal map view"
+msgstr "(N) нормальний вид мапи"
+
+#. TRANSLATORS: map view type in status bar
+#: src/gamemodifiers.cpp:376
+msgid "(D) debug map view"
+msgstr "(D) режим зневадження мапи"
+
+#. TRANSLATORS: map view type in status bar
+#: src/gamemodifiers.cpp:378
+msgid "(u) ultra map view"
+msgstr "(u) ультра режим мапи"
+
+#. TRANSLATORS: map view type in status bar
+#: src/gamemodifiers.cpp:380
+msgid "(U) ultra map view 2"
+msgstr "(U) ультра режим мапи 2"
+
+#. TRANSLATORS: map view type in status bar
+#: src/gamemodifiers.cpp:382
+msgid "(e) empty map view with collision"
+msgstr "(e) порожня мапа з видимим шаром зіткнень"
+
+#. TRANSLATORS: map view type in status bar
+#: src/gamemodifiers.cpp:384
+msgid "(E) empty map view"
+msgstr "(E) порожня мапа"
+
+#. TRANSLATORS: map view type in status bar
+#: src/gamemodifiers.cpp:386
+msgid "(b) black & white map view"
+msgstr "(b) чорно-біла мапа"
+
+#. TRANSLATORS: pickup size in status bar
+#: src/gamemodifiers.cpp:388
+msgid "(?) map view"
+msgstr "(?) невідомий режим мапи"
+
+#. TRANSLATORS: away type in status bar
+#: src/gamemodifiers.cpp:394
+msgid "(O) on keyboard"
+msgstr "(O) присутній"
+
+#. TRANSLATORS: away type in status bar
+#: src/gamemodifiers.cpp:396
+msgid "(A) away"
+msgstr "(A) відсутній"
+
+#. TRANSLATORS: away type in status bar
+#. TRANSLATORS: camera mode in status bar
+#: src/gamemodifiers.cpp:398 src/gamemodifiers.cpp:451
+msgid "(?) away"
+msgstr "(?) стан присутності невідомий"
+
+#. TRANSLATORS: away message box header
+#: src/gamemodifiers.cpp:421
+msgid "Away"
+msgstr "Відсутній"
+
+#. TRANSLATORS: camera mode in status bar
+#: src/gamemodifiers.cpp:447
+msgid "(G) game camera mode"
+msgstr "(G) ігровий режим камери"
+
+#. TRANSLATORS: camera mode in status bar
+#: src/gamemodifiers.cpp:449
+msgid "(F) free camera mode"
+msgstr "(F) вільний режим камери"
+
+#. TRANSLATORS: error message question
+#: src/gui/dialogsmanager.cpp:115
+msgid "Do you want to open support page?"
+msgstr "Чи бажаєте відвідати сторінку підтримки?"
+
+#. TRANSLATORS: message header
+#: src/gui/dialogsmanager.cpp:126 src/gui/dialogsmanager.cpp:150
+#: src/gui/dialogsmanager.cpp:166
+msgid "Message"
+msgstr "Повідомлення"
+
+#. TRANSLATORS: ok dialog button
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: revive player
+#: src/gui/dialogsmanager.cpp:129 src/gui/popups/popupmenu.cpp:2617
+msgid "Revive"
+msgstr "Опритомнити"
+
+#. TRANSLATORS: weight message
+#: src/gui/dialogsmanager.cpp:152
+msgid ""
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "Ви навантажені більше, ніж на половину максимально дозволенного. Тепер ви не зможете відновлюватися."
+
+#. TRANSLATORS: weight message
+#: src/gui/dialogsmanager.cpp:168
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr "Ви навантажені менш, ніж на половину. Тепер ви можете відновлюватися."
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:79
+#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:581
+msgid "default"
+msgstr "за замовчуванням"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr "чорний"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
+msgid "red"
+msgstr "червоний"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
+msgid "green"
+msgstr "зелений"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
+msgid "blue"
+msgstr "синій"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
+msgid "gold"
+msgstr "золотий"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
+msgid "yellow"
+msgstr "жовтий"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
+msgid "pink"
+msgstr "рожевий"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
+msgid "purple"
+msgstr "фіолетовий"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
+msgid "grey"
+msgstr "сірий"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
+msgid "brown"
+msgstr "коричневий"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "веселка 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "веселка 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "веселка 3"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:35
+msgid "Very small (8)"
+msgstr "Крихітний (8)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:37
+msgid "Very small (9)"
+msgstr "Крихітний (9)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:39
+msgid "Tiny (10)"
+msgstr "Дуже малий (10)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:41
+msgid "Small (11)"
+msgstr "Малий (11)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:43
+msgid "Medium (12)"
+msgstr "Середній (12)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:45
+msgid "Normal (13)"
+msgstr "Нормальний (13)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:47
+msgid "Large (14)"
+msgstr "Збільшений (14)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:49
+msgid "Large (15)"
+msgstr "Збільшений (15)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:51
+msgid "Large (16)"
+msgstr "Збільшений (16)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:53
+msgid "Big (17)"
+msgstr "Великий (17)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:55
+msgid "Big (18)"
+msgstr "Великий (18)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:57
+msgid "Big (19)"
+msgstr "Великий (19)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:59
+msgid "Very big (20)"
+msgstr "Дуже великий (20)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:61
+msgid "Very big (21)"
+msgstr "Дуже великий (21)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:63
+msgid "Very big (22)"
+msgstr "Дуже великий (22)"
+
+#. TRANSLATORS: font size
+#: src/gui/models/fontsizechoicelistmodel.h:65
+msgid "Huge (23)"
+msgstr "Величезний (23)"
+
+#. TRANSLATORS: language
+#. TRANSLATORS: popup menu header
+#: 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 "(за замовчуванням)"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:47
+msgid "Chinese (China)"
+msgstr "Китайська (Китай)"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:49
+msgid "Czech"
+msgstr "Чеська"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:51
+msgid "English"
+msgstr "Англійська"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:53
+msgid "Finnish"
+msgstr "Фінська"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:55
+msgid "French"
+msgstr "Французька"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:57
+msgid "German"
+msgstr "Німецька"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:59
+msgid "Indonesian"
+msgstr "Індонезійська"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:61
+msgid "Italian"
+msgstr "Італійська"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:63
+msgid "Polish"
+msgstr "Польська"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:65
+msgid "Japanese"
+msgstr "Японська"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:67
+msgid "Dutch (Belgium/Flemish)"
+msgstr "Данська (Бельгійська/Фламандська)"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:69
+msgid "Portuguese"
+msgstr "Португальська"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:71
+msgid "Portuguese (Brazilian)"
+msgstr "Португальська (Бразильська)"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:73
+msgid "Russian"
+msgstr "Російська"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:75
+msgid "Spanish (Castilian)"
+msgstr "Іспанська (Кастильська)"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:77
+msgid "Swedish (Sweden)"
+msgstr "Швецька (Швеція)"
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:79
+msgid "Turkish"
+msgstr "Турецька"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Загальна Магія"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Магія Життя"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Бойова Магія"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Трансмутація"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Магія Природи"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Астральна Магія"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:35
+msgid "Neutral"
+msgstr "Нейтрально"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:37
+msgid "Friend"
+msgstr "Друзі"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:39
+msgid "Disregarded"
+msgstr "Зневажені"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:41
+msgid "Ignored"
+msgstr "Ігноровані"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:43
+msgid "Erased"
+msgstr "Стерті"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:45
+msgid "Blacklisted"
+msgstr "В чорному списку"
+
+#. TRANSLATORS: relation type
+#: src/gui/models/playerrelationlistmodel.h:47
+msgid "Enemy"
+msgstr "Супротивники"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr "без впорядкування"
+
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr "впорядкувати за ціною"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr "впорядкувати за ім'ям"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
+msgid "by id"
+msgstr "впорядкувати за id"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
+msgid "by weight"
+msgstr "впорядкувати за вагою"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
+msgid "by amount"
+msgstr "впорядкувати за кількістю"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
+msgid "by type"
+msgstr "впорядкувати за типом"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Немає цілі"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Дозволити ціль"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Потребує ціль"
+
+#. TRANSLATORS: update type
+#. TRANSLATORS: onscreen button size
+#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:44
+msgid "Normal"
+msgstr "За замовчуванням"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:34
+msgid "Auto Close"
+msgstr "Автозакриття"
+
+#. TRANSLATORS: update type
+#: src/gui/models/updatetypemodel.h:36
+msgid "Skip"
+msgstr "Пропустити"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:135
+#, c-format
+msgid "Party: %s"
+msgstr "Група: %s"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:150
+#, c-format
+msgid "Guild: %s"
+msgstr "Гільдія: %s"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:164
+#, c-format
+msgid "Pvp rank: %u"
+msgstr "PVP ранг: %u"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:176
+#, c-format
+msgid "Comment: %s"
+msgstr "Примітка: %s"
+
+#. TRANSLATORS: party popup item
+#. TRANSLATORS: party creation message
+#: src/gui/popups/createpartypopup.h:51 src/gui/windows/socialwindow.cpp:502
+msgid "Create Party"
+msgstr "Створити групу"
+
+#. TRANSLATORS: party popup item
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: button in npc post dialog
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: unregister dialog. button.
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: 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:129
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
+#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/unregisterdialog.cpp:57
+#: src/gui/windows/updaterwindow.cpp:191 src/input/pages/gui.cpp:105
+msgid "Cancel"
+msgstr "Скасувати"
+
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:203
+#, c-format
+msgid "Weight: %s"
+msgstr "Вага: %s"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: trade with player
+#. TRANSLATORS: trade chat tab name
+#: src/gui/popups/popupmenu.cpp:158 src/gui/popups/popupmenu.cpp:788
+#: src/gui/widgets/tabs/chat/tradetab.cpp:35
+msgid "Trade"
+msgstr "Торгівля"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: trade attack player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: attack monster
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: attack player
+#. TRANSLATORS: Skill type
+#. TRANSLATORS: bot checker window table header
+#. TRANSLATORS: input action name
+#. TRANSLATORS: player stat
+#: 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:378 src/net/tmwa/generalhandler.cpp:329
+msgid "Attack"
+msgstr "Атака"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: send whisper to player
+#: 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:170 src/gui/popups/popupmenu.cpp:795
+msgid "Heal"
+msgstr "Вилікувати"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: kick player from guild
+#: 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: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: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:231
+msgid "Nuke"
+msgstr "Знищити"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move to player location
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move to npc location
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move to player position
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move to map item
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move to player position
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move to player location
+#. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: bot checker window table header
+#: 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 "Рух"
+
+#. TRANSLATORS: popup menu item
+#. 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/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:143
+msgid "Talk"
+msgstr "Діалог"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: buy from npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: buy item
+#. TRANSLATORS: buy dialog name
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: input action name
+#: 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 "Придбати"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: sell to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: sell item
+#. TRANSLATORS: sell dialog name
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: input action name
+#: 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
+msgid "Sell"
+msgstr "Продати"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add comment to npc
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add comment to player
+#: 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:289
+msgid "Remove from attack list"
+msgstr "Видалити зі списку атаки"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add monster to priotiry attack list
+#: 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:300
+msgid "Add to attack list"
+msgstr "Додати до списку атаки"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add monster to ignore list
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add item to pickup list
+#: 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:313 src/gui/popups/popupmenu.cpp:324
+msgid "Move to master"
+msgstr "Наблизити до власника"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: fire mercenary
+#: src/gui/popups/popupmenu.cpp:317
+msgid "Fire"
+msgstr "Атакувати"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed homunculus
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: feed pet
+#: 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:331
+msgid "Kill"
+msgstr "Вбити"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet drop loot
+#: src/gui/popups/popupmenu.cpp:341
+msgid "Drop loot"
+msgstr "Скинути дропи"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet unequip item
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: 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
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Зняти"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: pet return to egg
+#: src/gui/popups/popupmenu.cpp:348
+msgid "Return to egg"
+msgstr "Повернути до яйця"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add being name to chat
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add player name to chat
+#: 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:411 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: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: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: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:594 src/gui/popups/popupmenu.cpp:626
+msgid "Map Item"
+msgstr "Елемент карти"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: rename map item
+#: src/gui/popups/popupmenu.cpp:597 src/gui/windows/charselectdialog.cpp:130
+msgid "Rename"
+msgstr "Перейменувати"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: remove map item
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: remove attack target
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: remove item from pickup filter
+#: 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: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:639
+msgid "Move camera"
+msgstr "Рухати камеру"
+
+#. TRANSLATORS: popup menu header
+#. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: full button name
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window name
+#: 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:660
+msgid "Clear outfit"
+msgstr "Видалити швидке спорядження"
+
+#. TRANSLATORS: popup menu header
+#. TRANSLATORS: full button name
+#: 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: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:720 src/gui/windows/npcdialog.cpp:109
+msgid "Clear"
+msgstr "Скинути"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: disable chat tab highlight
+#: src/gui/popups/popupmenu.cpp:727
+msgid "Disable highlight"
+msgstr "Вимкнути підсвічування"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: enable chat tab highlight
+#: 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:739
+msgid "Don't remove name"
+msgstr "Не приховувати ім'я"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: remove player names from chat tab
+#: 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:751
+msgid "Enable away"
+msgstr "Дозволити режим \"Відсутній\""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: disable away messages in chat tab
+#: 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:764 src/gui/windows/socialwindow.cpp:89
+msgid "Leave"
+msgstr "Залишити"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: copy selected text to clipboard
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: copy link to clipboard
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: copy npc text to clipboard
+#: 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:887
+msgid "Change guild position"
+msgstr "Змінити позицію в гільдії"
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:932
+msgid "window"
+msgstr "вікно"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: unlock window
+#: src/gui/popups/popupmenu.cpp:958
+msgid "Unlock"
+msgstr "Відімкнути"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: lock window
+#: src/gui/popups/popupmenu.cpp:964
+msgid "Lock"
+msgstr "Зафіксувати"
+
+#. TRANSLATORS: number of chars in string should be near original
+#: 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:1014
+msgid "Name:                    "
+msgstr "Ім'я:                    "
+
+#: 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:1040
+msgid "Comment:                      "
+msgstr "Примітка:                     "
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add item to trade
+#: src/gui/popups/popupmenu.cpp:1642
+msgid "Add to trade"
+msgstr "Додати до торгівлі"
+
+#: src/gui/popups/popupmenu.cpp:1650
+msgid "Add to trade 10"
+msgstr "Додати до торгівлі 10"
+
+#: src/gui/popups/popupmenu.cpp:1655
+msgid "Add to trade half"
+msgstr "Додати половину до торгівлі"
+
+#: src/gui/popups/popupmenu.cpp:1659
+msgid "Add to trade all-1"
+msgstr "Додати все окрім одного"
+
+#: src/gui/popups/popupmenu.cpp:1663
+msgid "Add to trade all"
+msgstr "Додати всю кількість"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add item to storage
+#. TRANSLATORS: storage button
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: setup button
+#: 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 "Зберегти"
+
+#: src/gui/popups/popupmenu.cpp:1679
+msgid "Store 10"
+msgstr "Зберегти 10"
+
+#: src/gui/popups/popupmenu.cpp:1684
+msgid "Store half"
+msgstr "Зберегти половину"
+
+#: src/gui/popups/popupmenu.cpp:1688
+msgid "Store all-1"
+msgstr "Зберегти все окрім одного"
+
+#: 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:1704 src/gui/windows/inventorywindow.cpp:224
+msgid "Retrieve"
+msgstr "Вилучити"
+
+#: src/gui/popups/popupmenu.cpp:1712
+msgid "Retrieve 10"
+msgstr "Вилучити 10"
+
+#: src/gui/popups/popupmenu.cpp:1717
+msgid "Retrieve half"
+msgstr "Вилучити половину"
+
+#: src/gui/popups/popupmenu.cpp:1721
+msgid "Retrieve all-1"
+msgstr "Вилучити все окрім одного"
+
+#: src/gui/popups/popupmenu.cpp:1725
+msgid "Retrieve all"
+msgstr "Вилучити всю кількість"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: skills dialog button
+#. TRANSLATORS: inventory button
+#: 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
+msgid "Use"
+msgstr "Використати"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:1865
+msgid "Clear drop window"
+msgstr "Скинути значення комірців"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:1896 src/gui/popups/popupmenu.cpp:1957
+msgid "Hide"
+msgstr "Сховати"
+
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:1903 src/gui/popups/popupmenu.cpp:1964
+msgid "Show"
+msgstr "Показати"
+
+#. TRANSLATORS: popup menu item
+#: 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: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: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:2021 src/gui/popups/popupmenu.cpp:2040
+msgid "Move down"
+msgstr "Пріоритет нижче"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: undress item from player
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: undress player
+#: 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:2130
+msgid "Copy"
+msgstr "Копіювати"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: paste text from clipboard
+#: src/gui/popups/popupmenu.cpp:2133
+msgid "Paste"
+msgstr "Вставити"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: open link in browser
+#: src/gui/popups/popupmenu.cpp:2151
+msgid "Open link"
+msgstr "Відвідати посилання"
+
+#. TRANSLATORS: popup menu header
+#: 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: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: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: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: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: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:2264
+msgid "Be friend"
+msgstr "Приятелювати"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: remove player from ignore list
+#: 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:2351
+msgid "Follow"
+msgstr "Іти слідом"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: imitate player
+#: src/gui/popups/popupmenu.cpp:2355
+msgid "Imitation"
+msgstr "Імітувати"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: buy item
+#: 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:2382 src/gui/popups/popupmenu.cpp:2397
+msgid "Sell (?)"
+msgstr "Продати (?)"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: invite player to party
+#: src/gui/popups/popupmenu.cpp:2411 src/gui/popups/popupmenu.cpp:2435
+msgid "Invite to party"
+msgstr "Запросити до групи"
+
+#: src/gui/popups/popupmenu.cpp:2458
+#, c-format
+msgid "Join chat %s"
+msgstr "Ввійти до чату %s"
+
+#. TRANSLATORS: popup menu item
+#: 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:2483
+msgid "Remove from pickup list"
+msgstr "Видалити зі списку підбирання"
+
+#. TRANSLATORS: popup menu item
+#: 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:2537
+msgid "Unprotect item"
+msgstr "Зняти захист"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: add protection to item
+#: 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: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:2578
+msgid "Drop all"
+msgstr "Кинути все"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: drop item
+#. TRANSLATORS: full button name
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/windowmenu.cpp:129
+#: src/gui/windows/inventorywindow.cpp:731
+msgid "Drop"
+msgstr "Кинути"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: gm commands
+#: src/gui/popups/popupmenu.cpp:2595
+msgid "GM..."
+msgstr "ГМ..."
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2603
+msgid "GM commands"
+msgstr "ГМ команди"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: check player ip
+#: src/gui/popups/popupmenu.cpp:2608
+msgid "Check ip"
+msgstr "Перевірити IP"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: go to player position
+#: src/gui/popups/popupmenu.cpp:2611
+msgid "Goto"
+msgstr "Відвідати"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: recall player to current position
+#: src/gui/popups/popupmenu.cpp:2614
+msgid "Recall"
+msgstr "Викликати"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: kick player
+#: src/gui/popups/popupmenu.cpp:2622
+msgid "Kick"
+msgstr "Виштовхати"
+
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/setupinputpages.cpp:43
+msgid "Basic"
+msgstr "Загальне"
+
+#. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: full button name
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:121
+msgid "Shortcuts"
+msgstr "Швидкі клавіші"
+
+#. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: full button name
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/windowmenu.cpp:162
+msgid "Windows"
+msgstr "Вікна"
+
+#. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:54
+#: src/gui/windows/emotewindow.cpp:115
+msgid "Emotes"
+msgstr "Смайлики"
+
+#. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: settings tab name
+#. TRANSLATORS: chat window name
+#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:89
+msgid "Chat"
+msgstr "Чат"
+
+#. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: input action name
+#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
+#: 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:119
+#: src/gui/windows/registerdialog.cpp:104 src/input/pages/gui.cpp:87
+#: src/input/pages/other.cpp:108
+msgid "Other"
+msgstr "Інше"
+
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/setupinputpages.cpp:59
+msgid "Gui"
+msgstr "GUI"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr "Істота"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:118
+msgid "Friend names"
+msgstr "Приятелі"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:120
+msgid "Disregarded names"
+msgstr "Зневажені"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:122
+msgid "Ignored names"
+msgstr "Ігноровані"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:124
+msgid "Erased names"
+msgstr "Стерті"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:126
+msgid "Other players names"
+msgstr "Імена інших гравців"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:128
+msgid "Own name"
+msgstr "Власне ім'я"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:130
+msgid "GM names"
+msgstr "Імена ГМ'ів"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:132
+msgid "NPCs"
+msgstr "NPC"
+
+#. TRANSLATORS: palette color
+#. TRANSLATORS: settings option
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
+msgid "Monsters"
+msgstr "Моби"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:136
+msgid "Monster HP bar"
+msgstr "Рівень здоров'я мобу"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:139
+msgid "Monster HP bar (second color)"
+msgstr "Рівень здоров'я мобу (другий колір)"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:141
+msgid "Party members"
+msgstr "Члени групи"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:143
+msgid "Guild members"
+msgstr "Члени гільдії"
+
+#. TRANSLATORS: palette color
+#. TRANSLATORS: settings option
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
+msgid "Particle effects"
+msgstr "Ефекти частинок"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:147
+msgid "Pickup notification"
+msgstr "Повідомлення про підбирання"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:149
+msgid "Exp notification"
+msgstr "Повідомлення про зміну досвіду"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:151
+msgid "Player HP bar"
+msgstr "Рядок здоров'я гравця"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:155
+msgid "Player HP bar (second color)"
+msgstr "Здоров'я гравця (другий колір)"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:157
+msgid "Player hits monster"
+msgstr "Гравець вдарив тварюку"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:159
+msgid "Monster hits player"
+msgstr "Тварюка вдарила гравця"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:163
+msgid "Other player hits local player"
+msgstr "Гравець в вас влучив"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:165
+msgid "Critical Hit"
+msgstr "Критичний удар"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:169
+msgid "Local player hits monster"
+msgstr "Ви вдарили тварюку"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:172
+msgid "Local player critical hit"
+msgstr "Ваше здійснили критичне попадання"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:175
+msgid "Local player miss"
+msgstr "Ви промахнулись"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:177
+msgid "Misses"
+msgstr "Промах"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:179
+msgid "Portal highlight"
+msgstr "Підсвічення телепорту"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:182
+msgid "Default collision highlight"
+msgstr "Звичайне підсвічення шару зіткнень"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:185
+msgid "Air collision highlight"
+msgstr "Підсвічення зіткнень шару повітря"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:188
+msgid "Water collision highlight"
+msgstr "Підсвічення зіткнень біля води"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:191
+msgid "Special ground collision highlight"
+msgstr "Підсвічення особливих зіткнень"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:194
+msgid "Walkable highlight"
+msgstr "Підсвічення прохідної зони"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:197
+msgid "Local player attack range"
+msgstr "Дальність атаки"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:200
+msgid "Local player attack range border"
+msgstr "Межа дальності атаки"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:203
+msgid "Monster attack range"
+msgstr "Дальність атаки мобу"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:207
+msgid "Floor item amount color"
+msgstr "Колір кількості кинутих предметів"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:210
+msgid "Home place"
+msgstr "Домашня позиція"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:213
+msgid "Home place border"
+msgstr "Межа домашньої позиції"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:216
+msgid "Road point"
+msgstr "Точка шляху"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:219
+msgid "Tiles border"
+msgstr "Межа тайлів"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr "Улюбленці"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr "Крамарі"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr "Гомункул"
+
+#: src/gui/widgets/characterdisplay.cpp:135
+#, c-format
+msgid "Level: %u"
+msgstr "Рівень: %u"
+
+#. TRANSLATORS: status window label
+#: src/gui/widgets/characterdisplay.cpp:138
+#: 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"
+msgstr "Кошти: %s"
+
+#. TRANSLATORS: Text under equipped items (should be small)
+#: src/gui/widgets/itemcontainer.cpp:323
+msgid "Eq."
+msgstr "Вдяг."
+
+#. TRANSLATORS: dialog message
+#: src/gui/widgets/itemlinkhandler.cpp:72
+msgid "Open url"
+msgstr "Відвідати посилання"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: quit dialog name
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: input action name
+#: 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
+msgid "Quit"
+msgstr "Вийти"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. 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: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
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#. 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: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
+msgid "-"
+msgstr "-"
+
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#: 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"
+msgstr "Все"
+
+#. TRANSLATORS: sell dialog label
+#. TRANSLATORS: buy dialog label
+#: 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 "Ціна: %s / Загалом: %s"
+
+#. TRANSLATORS: setup item button
+#. TRANSLATORS: servers dialog button
+#: src/gui/widgets/setupitem.cpp:368 src/gui/widgets/setupitem.cpp:505
+#: src/gui/windows/serverdialog.cpp:130
+msgid "Edit"
+msgstr "Редагувати"
+
+#. TRANSLATORS: skill level
+#. TRANSLATORS: skills dialog. skill level
+#: src/gui/widgets/skillinfo.cpp:100 src/gui/windows/skilldialog.cpp:452
+#, c-format
+msgid "Lvl: %d"
+msgstr "Рівень: %d"
+
+#. TRANSLATORS: skill type
+#: src/gui/widgets/skillinfo.cpp:104
+#, c-format
+msgid "Type: %s"
+msgstr "Тип: %s"
+
+#. TRANSLATORS: Skill type
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:588
+msgid "Unknown"
+msgstr "Невідомий"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:119
+msgid "Ground"
+msgstr "Земля"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:124
+msgid "Self"
+msgstr "Сам"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:129
+msgid "Unused"
+msgstr "Не використаний"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:134
+msgid "Support"
+msgstr "Довідка"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:139
+msgid "Target trap"
+msgstr "Пастка"
+
+#. TRANSLATORS: Skill type
+#: src/gui/widgets/skillinfo.cpp:143
+msgid "Unknown:"
+msgstr "Невідомо:"
+
+#: src/gui/widgets/skillinfo.cpp:149
+#, c-format
+msgid " / Mana: -%d"
+msgstr " / Мана: -%d"
+
+#: src/gui/widgets/skillinfo.cpp:155
+#, c-format
+msgid "Range: %d"
+msgstr "Дальність: %d"
+
+#. TRANSLATORS: battle chat tab name
+#: src/gui/widgets/tabs/chat/battletab.cpp:35
+msgid "Battle"
+msgstr "Бій"
+
+#. TRANSLATORS: chat message
+#: src/gui/widgets/tabs/chat/chattab.cpp:167
+msgid "Global announcement:"
+msgstr "Глобальне повідомлення:"
+
+#. TRANSLATORS: chat message
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Глобальне повідомлення від %s:"
+
+#. TRANSLATORS: chat message
+#: src/gui/widgets/tabs/chat/chattab.cpp:199
+#, c-format
+msgid "%s whispers: %s"
+msgstr "%s шепоче: %s"
+
+#. TRANSLATORS: chat message
+#: src/gui/widgets/tabs/chat/chattab.cpp:555
+#, c-format
+msgid "%s is now Online."
+msgstr "%s з'явився онлайн."
+
+#. TRANSLATORS: chat message
+#: src/gui/widgets/tabs/chat/chattab.cpp:560
+#, c-format
+msgid "%s is now Offline."
+msgstr "%s вийшов з гри."
+
+#. TRANSLATORS: guild chat tab name
+#. TRANSLATORS: tab in social window
+#: src/gui/widgets/tabs/chat/emulateguildtab.cpp:38
+#: src/gui/widgets/tabs/chat/guildtab.cpp:45
+#: src/gui/widgets/tabs/socialguildtab2.h:48
+#: src/gui/widgets/tabs/socialguildtab.h:50
+msgid "Guild"
+msgstr "Гільдія"
+
+#. TRANSLATORS: gb tab name
+#: src/gui/widgets/tabs/chat/gmtab.cpp:31
+msgid "GM"
+msgstr "ГМ"
+
+#. TRANSLATORS: lang chat tab name
+#: src/gui/widgets/tabs/chat/langtab.cpp:32
+msgid "Lang"
+msgstr "Мова"
+
+#. TRANSLATORS: party chat tab name
+#. TRANSLATORS: tab in social window
+#: src/gui/widgets/tabs/chat/partytab.cpp:45
+#: src/gui/widgets/tabs/socialpartytab.h:51
+msgid "Party"
+msgstr "Група"
+
+#. TRANSLATORS: chat message
+#. TRANSLATORS: notification message
+#: src/gui/widgets/tabs/chat/partytab.cpp:98 src/resources/notifications.h:207
+msgid "Item sharing enabled."
+msgstr "Розподіл предметів увімкнено."
+
+#. TRANSLATORS: chat message
+#. TRANSLATORS: notification message
+#: src/gui/widgets/tabs/chat/partytab.cpp:103
+#: src/resources/notifications.h:211
+msgid "Item sharing disabled."
+msgstr "Розподіл предметів вимкнено."
+
+#. TRANSLATORS: chat message
+#. TRANSLATORS: notification message
+#: src/gui/widgets/tabs/chat/partytab.cpp:108
+#: src/resources/notifications.h:215
+msgid "Item sharing not possible."
+msgstr "Неможливо ввімкнути розподіл предметів!"
+
+#. TRANSLATORS: chat message
+#: src/gui/widgets/tabs/chat/partytab.cpp:113
+msgid "Item sharing unknown."
+msgstr "Невідомий стан розподілу предметів."
+
+#. TRANSLATORS: chat message
+#. TRANSLATORS: notification message
+#: src/gui/widgets/tabs/chat/partytab.cpp:148
+#: src/resources/notifications.h:195
+msgid "Experience sharing enabled."
+msgstr "Розподіл досвіду ввімкнено."
+
+#. TRANSLATORS: chat message
+#. TRANSLATORS: notification message
+#: src/gui/widgets/tabs/chat/partytab.cpp:153
+#: src/resources/notifications.h:199
+msgid "Experience sharing disabled."
+msgstr "Розподіл досвіду вимкнено."
+
+#. TRANSLATORS: chat message
+#. TRANSLATORS: notification message
+#: src/gui/widgets/tabs/chat/partytab.cpp:158
+#: src/resources/notifications.h:203
+msgid "Experience sharing not possible."
+msgstr "Неможливо ввімкнути розподіл досвіду!"
+
+#. TRANSLATORS: chat message
+#: src/gui/widgets/tabs/chat/partytab.cpp:163
+msgid "Experience sharing unknown."
+msgstr "Невідомий стан розподілу досвіду."
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:53
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:188
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:239
+msgid "Music:"
+msgstr "Музика:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:55
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:194
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+msgid "Map:"
+msgstr "Мапа:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:57
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:191
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:241
+msgid "Minimap:"
+msgstr "Мінімапа:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:60
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:185
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:237
+msgid "Cursor:"
+msgstr "Вказівник:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:63
+msgid "Particle count:"
+msgstr "Число ефектів частинок:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:66
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:247
+msgid "Map actors count:"
+msgstr "Кількість об'єктів:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:68
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:166
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:172
+msgid "Player Position:"
+msgstr "Позиція гравця:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:74
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:220
+msgid "Draw calls:"
+msgstr "Викликів малюв.:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:79
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+msgid "Texture binds:"
+msgstr "Зв'язаних текстур:"
+
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#, c-format
+msgid "%d FPS"
+msgstr "%d FPS"
+
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:84
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:255
+#, c-format
+msgid "%d LPS"
+msgstr "%d LPS"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:95
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:123
+#, c-format
+msgid "%d FPS (Software)"
+msgstr "%d FPS (Програмно)"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:102
+#, c-format
+msgid "%d FPS (normal OpenGL)"
+msgstr "%d FPS (звичайний OpenGL)"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:106
+#, c-format
+msgid "%d FPS (safe OpenGL)"
+msgstr "%d FPS (безпечний OpenGL)"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
+#, c-format
+msgid "%d FPS (mobile OpenGL)"
+msgstr "%d FPS (мобільний OpenGL)"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
+#, c-format
+msgid "%d FPS (modern OpenGL)"
+msgstr "%d FPS (новітній OpenGL)"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
+#, c-format
+msgid "%d FPS (SDL2 default)"
+msgstr "%d FPS (з SDL2)"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:143
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+msgid "Textures count:"
+msgstr "Кількість текстур:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:202
+#, c-format
+msgid "Particle count: %d"
+msgstr "Кількість частинок: %d"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+msgid "Target:"
+msgstr "Ціль:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+msgid "Target Id:"
+msgstr "ID цілі:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+msgid "Target type:"
+msgstr "Тип цілі:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:269
+msgid "Target level:"
+msgstr "Рівень цілі:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
+msgid "Target race:"
+msgstr "Раса цілі:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
+msgid "Target party:"
+msgstr "Група цілі:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:275
+msgid "Target guild:"
+msgstr "Гільдія цілі:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+msgid "Attack delay:"
+msgstr "Затримка атаки:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
+msgid "Minimal hit:"
+msgstr "Найменше ушкодження:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
+msgid "Maximum hit:"
+msgstr "Найбільше ушкодження:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+msgid "Critical hit:"
+msgstr "Критичне ушкодження:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr "Карма:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr "Манери:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+msgid "Target Level:"
+msgstr "Рівень цілі:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
+msgid "Target Party:"
+msgstr "Група цілі:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
+msgid "Target Guild:"
+msgstr "Гільдія цілі:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
+#, c-format
+msgid "Ping: %s ms"
+msgstr "Пінг: %s ms"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
+#, c-format
+msgid "In: %d bytes/s"
+msgstr "В: %d bytes/s"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr "Із: %d bytes/s"
+
+#. TRANSLATORS: audio tab in settings
+#: src/gui/widgets/tabs/setup_audio.cpp:51
+msgid "Audio"
+msgstr "Звук"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:59
+msgid "Basic settings"
+msgstr "Загальне"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:62
+msgid "Enable Audio"
+msgstr "Ввімкнути звук"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:65
+msgid "Enable music"
+msgstr "Ввімкнути музику"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:69
+msgid "Enable game sfx"
+msgstr "Ввімкнути спец. ефекти гри"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:73
+msgid "Enable gui sfx"
+msgstr "Ввімкнути ефекти клієнту"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:77
+msgid "Sfx volume"
+msgstr "Гучність ефектів"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:82
+msgid "Music volume"
+msgstr "Гучність музики"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:87
+msgid "Enable music fade out"
+msgstr "Ввімкнути затухання музики"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:91
+msgid "Audio frequency"
+msgstr "Частота звуку"
+
+#. TRANSLATORS: audio type
+#: src/gui/widgets/tabs/setup_audio.cpp:95
+msgid "mono"
+msgstr "моно"
+
+#. TRANSLATORS: audio type
+#: src/gui/widgets/tabs/setup_audio.cpp:97
+msgid "stereo"
+msgstr "стерео"
+
+#. TRANSLATORS: audio type
+#: src/gui/widgets/tabs/setup_audio.cpp:99
+msgid "surround"
+msgstr "об'ємний"
+
+#. TRANSLATORS: audio type
+#: src/gui/widgets/tabs/setup_audio.cpp:101
+msgid "surround+center+lfe"
+msgstr "об'ємний+центр+LFE"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:103
+msgid "Audio channels"
+msgstr "Канали"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_audio.cpp:108
+msgid "Sound effects"
+msgstr "Звукові ефекти"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:111
+msgid "Information dialog sound"
+msgstr "Звук діалогу оповіщення"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:115
+msgid "Request dialog sound"
+msgstr "Звук діалогу запиту"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:119
+msgid "Whisper message sound"
+msgstr "Звук приватного повідомлення"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:123
+msgid "Guild / Party message sound"
+msgstr "Повідомлення гільдії/групи"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:127
+msgid "Highlight message sound"
+msgstr "Звук привернення уваги"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:131
+msgid "Global message sound"
+msgstr "Звук глобального оповіщення"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:135
+msgid "Error message sound"
+msgstr "Звук помилки"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:139
+msgid "Trade request sound"
+msgstr "Звук пропозиції торгівлі"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:143
+msgid "Show window sound"
+msgstr "Звук відкриття вікна"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:147
+msgid "Hide window sound"
+msgstr "Звук ховання вікна"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:155
+msgid "Enable mumble voice chat"
+msgstr "Увімкнути голосовий чат Mumble"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:160
+msgid "Download music"
+msgstr "Завантажити музику"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_chat.cpp:48
+msgid "Window"
+msgstr "Вікно"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:51
+msgid "Auto hide chat window"
+msgstr "Автоматично ховати вікно"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:55
+msgid "Protect chat focus"
+msgstr "Захищати фокус чату"
+
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#. TRANSLATORS: emotes tab name
+#: src/gui/widgets/tabs/setup_chat.cpp:60
+#: src/gui/widgets/tabs/setup_colors.cpp:88
+#: src/gui/windows/emotewindow.cpp:117
+msgid "Colors"
+msgstr "Кольори"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:63
+msgid "Remove colors from received chat messages"
+msgstr "Видаляти забарвлення вхідних повідомлень чату"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr "Показувати список кольорів чату"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:72
+msgid "Commands"
+msgstr "Команди"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:75
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr "Дозволити магію та ГМ команди у всіх вкладках чату"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_chat.cpp:80
+msgid "Limits"
+msgstr "Ліміти"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:83
+msgid "Limit max chars in chat line"
+msgstr "Обмежити кількість символів у повідомлені чату"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:87
+msgid "Limit max lines in chat"
+msgstr "Обмежити кількість рядків вікна чату"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_chat.cpp:92
+msgid "Logs"
+msgstr "Логи"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:95
+msgid "Enable chat Log"
+msgstr "Ввімкнути лог чату"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:99
+msgid "Enable debug chat Log"
+msgstr "Ввімкнути лог зневадження"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:103
+msgid "Show chat history"
+msgstr "Показувати історію чату"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:107
+msgid "Show party online messages"
+msgstr "Сповіщати про появлення членів групи"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:111
+msgid "Show guild online messages"
+msgstr "Сповіщати про появлення членів гільдії"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_chat.cpp:116
+msgid "Messages"
+msgstr "Повідомлення"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:119
+msgid "Hide shop messages"
+msgstr "Не показувати робочі повідомлення крамниці"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:123
+msgid "Show MVP messages"
+msgstr "Показувати MVP повідомлення"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_chat.cpp:128
+msgid "Tabs"
+msgstr "Вкладки"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:131
+msgid "Put all whispers in tabs"
+msgstr "Шепіт (приватне спілкування) в окремих вкладках"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:135
+msgid "Log magic messages in debug tab"
+msgstr "Лог магії у вкладці зневадження"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:139
+msgid "Show server messages in debug tab"
+msgstr "Показувати сповіщення сервера у вкладці зневадження"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:143
+msgid "Enable trade tab"
+msgstr "Ввімкнути вкладку торгівлі"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:147
+msgid "Enable gm tab"
+msgstr "Ввімкнути ГМ вкладку"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:151
+msgid "Enable language tab"
+msgstr "Ввімкнути вкладку для мови"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:155
+msgid "Show all languages messages"
+msgstr "Показувати повідомлення на всіх мовах"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:159
+msgid "Enable battle tab"
+msgstr "Ввімкнути вкладку бійки"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:163
+msgid "Show battle events"
+msgstr "Показувати події бійки"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:167
+msgid "Resize chat tabs if need"
+msgstr "Змінювати розмір вкладок чату за потребою"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_chat.cpp:172
+msgid "Time"
+msgstr "Час"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:175
+msgid "Use local time"
+msgstr "Вживати місцевий час"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:182
+msgid "Highlight words (separated by comma)"
+msgstr "Підсвічувані слова (відокремлені комами)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:186
+msgid "Globals ignore names (separated by comma)"
+msgstr "Ігнорування глобальні повідомлення від (відокремити комами)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:190
+msgid "Show emotes button in chat"
+msgstr "Показати кнопку смайликів у чаті"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:194
+msgid "Show motd server message on start"
+msgstr "Показувати серверне привітання"
+
+#: src/gui/widgets/tabs/setup_colors.cpp:50
+msgid "This is what the color looks like"
+msgstr "Ось, як виглядає цей колір"
+
+#. TRANSLATORS: colors tab. label.
+#: src/gui/widgets/tabs/setup_colors.cpp:65
+msgid "Type:"
+msgstr "Тип:"
+
+#. TRANSLATORS: colors tab. label.
+#: src/gui/widgets/tabs/setup_colors.cpp:69
+#: src/gui/widgets/tabs/setup_colors.cpp:336
+msgid "Delay:"
+msgstr "Затримка:"
+
+#. TRANSLATORS: colors tab. label.
+#: src/gui/widgets/tabs/setup_colors.cpp:73
+msgid "Red:"
+msgstr "Червоний:"
+
+#. TRANSLATORS: colors tab. label.
+#: src/gui/widgets/tabs/setup_colors.cpp:77
+msgid "Green:"
+msgstr "Зелений:"
+
+#. TRANSLATORS: colors tab. label.
+#: src/gui/widgets/tabs/setup_colors.cpp:81
+msgid "Blue:"
+msgstr "Синій:"
+
+#. TRANSLATORS: color type
+#: src/gui/widgets/tabs/setup_colors.cpp:107
+#: src/gui/widgets/tabs/setup_colors.cpp:403
+msgid "Static"
+msgstr "Статичне"
+
+#. TRANSLATORS: color type
+#: src/gui/widgets/tabs/setup_colors.cpp:110
+#: src/gui/widgets/tabs/setup_colors.cpp:113
+#: src/gui/widgets/tabs/setup_colors.cpp:405
+msgid "Pulse"
+msgstr "Пульсуюче"
+
+#. TRANSLATORS: color type
+#: src/gui/widgets/tabs/setup_colors.cpp:115
+#: src/gui/widgets/tabs/setup_colors.cpp:118
+#: src/gui/widgets/tabs/setup_colors.cpp:407
+msgid "Rainbow"
+msgstr "Веселка"
+
+#. TRANSLATORS: color type
+#: src/gui/widgets/tabs/setup_colors.cpp:120
+#: src/gui/widgets/tabs/setup_colors.cpp:123
+#: src/gui/widgets/tabs/setup_colors.cpp:407
+msgid "Spectrum"
+msgstr "Спектр"
+
+#. TRANSLATORS: colors tab. label.
+#: src/gui/widgets/tabs/setup_colors.cpp:330
+msgid "Alpha:"
+msgstr "Прозорість:"
+
+#. TRANSLATORS: button in input settings tab
+#: src/gui/widgets/tabs/setup_input.cpp:63
+msgid "Assign"
+msgstr "Призначити"
+
+#. TRANSLATORS: button in input settings tab
+#: src/gui/widgets/tabs/setup_input.cpp:65
+msgid "Unassign"
+msgstr "Відмінити"
+
+#. TRANSLATORS: button in input settings tab
+#: src/gui/widgets/tabs/setup_input.cpp:67
+msgid "Default"
+msgstr "За замовчуванням"
+
+#. TRANSLATORS: button in input settings tab
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Reset all keys"
+msgstr "Скинути всі клавіші"
+
+#. TRANSLATORS: setting tab name
+#: src/gui/widgets/tabs/setup_input.cpp:79
+msgid "Input"
+msgstr "Введення"
+
+#. TRANSLATORS: input settings error header
+#: src/gui/widgets/tabs/setup_input.cpp:157
+msgid "Key Conflict(s) Detected."
+msgstr "Деякі клавіші дублюють одна одну."
+
+#. TRANSLATORS: input settings error
+#: src/gui/widgets/tabs/setup_input.cpp:159
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "Клавіші \"%s\" та \"%s\" конфліктують. Необхідно усунути повтори,інакше керування може бути ускладненим"
+
+#. TRANSLATORS: unknown key name
+#. TRANSLATORS: quests window quest name
+#: src/gui/widgets/tabs/setup_input.cpp:329
+#: src/gui/windows/questswindow.cpp:203
+msgid "unknown"
+msgstr "невідоме"
+
+#. TRANSLATORS: joystick settings tab label
+#: src/gui/widgets/tabs/setup_joystick.cpp:49
+#: src/gui/widgets/tabs/setup_joystick.cpp:139
+msgid "Press the button to start calibration"
+msgstr "Натисніть кнопку для початку налаштування"
+
+#. TRANSLATORS: joystick settings tab button
+#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:136
+msgid "Calibrate"
+msgstr "Налаштування"
+
+#. TRANSLATORS: joystick settings tab button
+#: src/gui/widgets/tabs/setup_joystick.cpp:53
+msgid "Detect joysticks"
+msgstr "Виявити джойстики"
+
+#. TRANSLATORS: joystick settings tab checkbox
+#: src/gui/widgets/tabs/setup_joystick.cpp:56
+msgid "Enable joystick"
+msgstr "Використовувати джойстик"
+
+#. TRANSLATORS: joystick settings tab checkbox
+#: src/gui/widgets/tabs/setup_joystick.cpp:60
+msgid "Use joystick if client window inactive"
+msgstr "Використовувати джойстик якщо вікно гри неактивне"
+
+#. TRANSLATORS: joystick settings tab name
+#: src/gui/widgets/tabs/setup_joystick.cpp:64
+msgid "Joystick"
+msgstr "Джойстик"
+
+#. TRANSLATORS: joystick settings tab button
+#: src/gui/widgets/tabs/setup_joystick.cpp:145
+msgid "Stop"
+msgstr "Зупинити"
+
+#. TRANSLATORS: joystick settings tab label
+#: src/gui/widgets/tabs/setup_joystick.cpp:148
+msgid "Rotate the stick and don't press buttons"
+msgstr "Обертайте стік та не натискайте кнопки"
+
+#. TRANSLATORS: mods tab in settings
+#: src/gui/widgets/tabs/setup_mods.cpp:42
+msgid "Mods"
+msgstr "Моди"
+
+#. TRANSLATORS: settings label
+#: src/gui/widgets/tabs/setup_mods.cpp:77
+msgid "No mods present"
+msgstr "Немає доступних модів"
+
+#. TRANSLATORS: show buttons at top right corner type
+#: src/gui/widgets/tabs/setup_other.cpp:50
+msgid "Always show"
+msgstr "Завжди показувати"
+
+#. TRANSLATORS: show buttons at top right corner type
+#: src/gui/widgets/tabs/setup_other.cpp:52
+msgid "Auto hide in small resolution"
+msgstr "Приховати при малій роздільності"
+
+#. TRANSLATORS: show buttons at top right corner type
+#: src/gui/widgets/tabs/setup_other.cpp:54
+msgid "Always auto hide"
+msgstr "Завжди приховувати"
+
+#. TRANSLATORS: Proxy type selection
+#: src/gui/widgets/tabs/setup_other.cpp:62
+msgid "System proxy"
+msgstr "Системний проксі"
+
+#. TRANSLATORS: Proxy type selection
+#: src/gui/widgets/tabs/setup_other.cpp:64
+msgid "Direct connection"
+msgstr "Безпосереднє з'єднання"
+
+#. TRANSLATORS: Proxy type selection
+#: src/gui/widgets/tabs/setup_other.cpp:71
+msgid "SOCKS5 hostname"
+msgstr "SOCKS5 хост"
+
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: ambient effect type
+#. TRANSLATORS: particle details
+#: src/gui/widgets/tabs/setup_other.cpp:81
+#: src/gui/widgets/tabs/setup_visual.cpp:59
+#: src/gui/widgets/tabs/setup_visual.cpp:161
+msgid "low"
+msgstr "низька"
+
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: particle details
+#: src/gui/widgets/tabs/setup_other.cpp:83
+#: src/gui/widgets/tabs/setup_visual.cpp:163
+msgid "medium"
+msgstr "середня"
+
+#. TRANSLATORS: screen density type
+#: src/gui/widgets/tabs/setup_other.cpp:85
+msgid "tv"
+msgstr "TV"
+
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: ambient effect type
+#. TRANSLATORS: particle details
+#: src/gui/widgets/tabs/setup_other.cpp:87
+#: src/gui/widgets/tabs/setup_visual.cpp:61
+#: src/gui/widgets/tabs/setup_visual.cpp:165
+msgid "high"
+msgstr "висока"
+
+#. TRANSLATORS: screen density type
+#: src/gui/widgets/tabs/setup_other.cpp:89
+msgid "xhigh"
+msgstr "висока+"
+
+#. TRANSLATORS: screen density type
+#: src/gui/widgets/tabs/setup_other.cpp:91
+msgid "xxhigh"
+msgstr "висока++"
+
+#. TRANSLATORS: misc tab in settings
+#: src/gui/widgets/tabs/setup_other.cpp:101
+msgid "Misc"
+msgstr "Різне"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:111
+msgid "Show damage inflicted to monsters"
+msgstr "Показувати ушкодження мобів"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:115
+msgid "Auto target only reachable monsters"
+msgstr "Брати у ціль тільки досяжних мобів"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:119
+msgid "Highlight monster attack range"
+msgstr "Підсвічувати межу атаки мобів"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:124
+msgid "Show monster hp bar"
+msgstr "Показувати рівень здоров'я мобів"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:128
+msgid "Cycle monster targets"
+msgstr "Прокручувати мобів по колу"
+
+#. TRANSLATORS: settings group
+#. TRANSLATORS: debug window tab
+#. TRANSLATORS: mini map window name
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
+#: src/gui/windows/minimap.cpp:121
+msgid "Map"
+msgstr "Локація"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:136
+msgid "Show warps particles"
+msgstr "Показувати частинки телепортів"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:140
+msgid "Highlight map portals"
+msgstr "Підсвічувати телепорти"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:144
+msgid "Highlight floor items"
+msgstr "Підсвічувати кинуті предмети"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:148
+msgid "Highlight player attack range"
+msgstr "Підсвічувати межу досяжності атаки"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:152
+msgid "Show extended minimaps"
+msgstr "Показувати розширені мінімапи"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:156
+msgid "Draw path"
+msgstr "Малювати шлях"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:160
+msgid "Draw hotkeys on map"
+msgstr "Показувати користувацькі локації на мапі"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:164
+msgid "Enable lazy scrolling"
+msgstr "Ввімкнути ледаче гортання"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:168
+msgid "Scroll laziness"
+msgstr "Рівень ледачості"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:172
+msgid "Scroll radius"
+msgstr "Радіус гортання"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:176
+msgid "Auto resize minimaps"
+msgstr "Автоматично змінювати розмір мінімап"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:180
+msgid "Play map animations"
+msgstr "Дозволити анімації мапи"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_other.cpp:185
+msgid "Moving"
+msgstr "Рухи"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:188
+msgid "Auto fix position"
+msgstr "Корегування позиції"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:192
+msgid "Show server side position"
+msgstr "Показати позицію на боці серверу"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:196
+msgid "Attack while moving"
+msgstr "Атакувати під час руху"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:200
+msgid "Attack next target"
+msgstr "Атакувати наступну ціль"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:204
+msgid "Sync player move"
+msgstr "Синхронізувати рух"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:208
+msgid "Crazy move A program"
+msgstr "Користувацькі божевільні рухи (програма A)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:212
+msgid "Mouse relative moves (good for touch interfaces)"
+msgstr "Рух відносно миші (добре для тач інтерфейсів)"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_other.cpp:217
+msgid "Player"
+msgstr "Гравець"
+
+#: src/gui/widgets/tabs/setup_other.cpp:219
+msgid "Show own hp bar"
+msgstr "Показувати свій рівень здоров'я"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:223
+msgid "Enable quick stats"
+msgstr "Дозволити швидку зміну характеристик"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:227
+msgid "Cycle player targets"
+msgstr "Прокручувати гравців по колу"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:231
+msgid "Show job exp messages"
+msgstr "Показувати досвід роботи"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:235
+msgid "Show players popups"
+msgstr "Показувати бульбашки від гравців"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:239
+msgid "Afk message"
+msgstr "Повідомлення режиму відсутності"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:243
+msgid "Show job"
+msgstr "Показувати роботу"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:247
+msgid "Enable attack filter"
+msgstr "Ввімкнути фільтр атаки"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:251
+msgid "Enable pickup filter"
+msgstr "Ввімкнути фільтр підбирання"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:255
+msgid "Enable advert protocol"
+msgstr "Дозволити трансляцію стану клієнта"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:259
+msgid "Enabled pets support"
+msgstr "Ввімкнути підтримку улюбленців"
+
+#: src/gui/widgets/tabs/setup_other.cpp:262
+msgid "Enable weight notifications"
+msgstr "Повідомляти про вагове перенавантаження"
+
+#. TRANSLATORS: settings group
+#. TRANSLATORS: full button name
+#. TRANSLATORS: shop window name
+#. 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:194
+msgid "Shop"
+msgstr "Крамниця"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:270
+msgid "Accept sell/buy requests"
+msgstr "Приймати пропозиції купівлі/продажу"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:274
+msgid "Enable shop mode"
+msgstr "Ввімкнути режим крамниці"
+
+#. TRANSLATORS: settings group
+#. TRANSLATORS: npc dialog name
+#. TRANSLATORS: npc post dialog caption
+#: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:85
+#: src/gui/windows/npcpostdialog.cpp:43
+msgid "NPC"
+msgstr "NPC"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:282
+msgid "Cycle npc targets"
+msgstr "Прокручувати NPC по колу"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:286
+msgid "Log NPC dialogue"
+msgstr "Зберігати діалог з NPC"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_other.cpp:291
+msgid "Bots support"
+msgstr "Підтримка ботів"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:294
+msgid "Enable guild bot support and disable native guild support"
+msgstr "Ввімкнути підтримку guild-боту та вимкнути серверну підтримку гільдій"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_other.cpp:300
+msgid "Keyboard"
+msgstr "Клавіатура"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:303
+msgid "Repeat delay"
+msgstr "Затримка перед повторенням"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:307
+msgid "Repeat interval"
+msgstr "Інтервал повторення"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:311
+msgid "Custom repeat interval"
+msgstr "Користувацький Інтервал"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:319
+msgid "Shortcut buttons"
+msgstr "Клавіші"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_other.cpp:324
+msgid "Proxy server"
+msgstr "Проксі сервер"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:328
+msgid "Proxy type"
+msgstr "Тип проксі"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:332
+msgid "Proxy address:port"
+msgstr "Проксі хост:порт"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:340
+msgid "Enable server side attack"
+msgstr "Ввімкнути серверну атаку"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:344
+msgid "Hide support page link on error"
+msgstr "Не видавати адресу підтримки при помилці"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:348
+msgid "Enable double clicks"
+msgstr "Ввімкнути підтримку подвійних кліків"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:352
+msgid "Enable bot checker"
+msgstr "Ввімкнути перевірку ботів"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:356
+msgid "Enable buggy servers protection (do not disable)"
+msgstr "Ввімкнути захист від глючних серверів (не вимикати!)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:361
+msgid "Enable debug log"
+msgstr "Ввімкнути лог зневадження"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:365
+msgid "Ignore logging packets"
+msgstr "Не вносити в лог мережеві пакети"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:369
+msgid "Enable OpenGL log"
+msgstr "Ввімкнути OpenGL лог"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:373
+msgid "Enable input log"
+msgstr "Ввімкнути лог введення"
+
+#. TRANSLATORS: settings option
+#. TRANSLATORS: input action name
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:404
+msgid "Upload log file"
+msgstr "Завантажили лог файл"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
+msgid "Low traffic mode"
+msgstr "Режим кешування гравців"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:385
+msgid "Hide shield sprite"
+msgstr "Не показувати щит"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:390
+msgid "Use FBO for screenshots (only for opengl)"
+msgstr "Вживати FBO для скріншотів (тільки OpenGL)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:396
+msgid "Screenshot directory"
+msgstr "Тека скріншотів"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:401
+msgid "Network delay between sub servers"
+msgstr "Встановити затримку з'єднання між підсерверами"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:405
+msgid "Show background"
+msgstr "Показати фон"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:410
+msgid "Screen density override"
+msgstr "Корекція роздільності екрану"
+
+#. TRANSLATORS: texture compression type
+#. TRANSLATORS: confirm dialog button
+#: src/gui/widgets/tabs/setup_perfomance.cpp:42
+#: src/gui/windows/confirmdialog.cpp:57
+msgid "No"
+msgstr "Ні"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:62
+msgid "Better performance (enable for better performance)"
+msgstr "Краща продуктивність (ввімкніть для покращення)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:66
+msgid "Auto adjust performance"
+msgstr "Автоматичне пристосування продуктивності"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:70
+msgid "Hw acceleration"
+msgstr "Апаратне прискорення"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:74
+msgid "Enable opacity cache (Software, can use much memory)"
+msgstr "Ввімкнути кеш прозорості (програмно, може використати багато пам'яті)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:79
+msgid "Enable map reduce (Software)"
+msgstr "Ввімкнути оптимізацію карти (програмно)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:84
+msgid "Enable compound sprite delay (Software)"
+msgstr "Ввімкнути затримку у компонентному спрайті (програмно)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:88
+msgid "Enable delayed images load (OpenGL)"
+msgstr "Дозволити паузу при завантаженні зображень (OpenGL)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:92
+msgid "Enable texture sampler (OpenGL)"
+msgstr "Ввімкнути \"зразок\" текстур (OpenGL)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:97
+msgid "Better quality (disable for better performance)"
+msgstr "Покращити якість (вимкніть для кращої продуктивності)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:101
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr "Ввімкнути програмне відтворення прозорості (може бути дуже повільним)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:106
+msgid "Show beings transparency"
+msgstr "Обробляти прозорість для істот"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:110
+msgid "Enable reorder sprites (need for mods support)."
+msgstr "Ввімкнути транспозицію спрайтів (потрібне для модів)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:115
+msgid "Small memory (enable for lower memory usage)"
+msgstr "Режим економії пам'яті (при нестачі)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:120
+msgid "Disable advanced beings caching (Software)"
+msgstr "Вимкнути розширене кешування істот (програмне)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:124
+msgid "Disable beings caching (Software)"
+msgstr "Вимкнути кешування істот"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_perfomance.cpp:129
+msgid "Different options (enable or disable can improve performance)"
+msgstr "Різні налаштунки (ввімкнення чи вимкнення може призвести до кращої продуктивності)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:134
+msgid "Enable texture compression (OpenGL)"
+msgstr "Ввімкнути сжимання текстур (OpenGL)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:138
+msgid "Enable rectangular texture extension (OpenGL)"
+msgstr "Ввімкнути розширення для прямокутних текстур (OpenGL)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:142
+msgid "Use new texture internal format (OpenGL)"
+msgstr "Вживати новий формат текстур (OpenGL)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:146
+msgid "Enable texture atlases (OpenGL)"
+msgstr "Ввімкнути атласи текстур (OpenGL)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:150
+msgid "Cache all sprites per map (can use additional memory)"
+msgstr "Заносити в кеш всі спрайти на мапі (може забрати додаткову пам'ять)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:155
+msgid "Cache all sounds (can use additional memory)"
+msgstr "Занести в кеш всі звуки (може забрати додаткову пам'ять)"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_perfomance.cpp:160
+msgid "Critical options (DO NOT change if you don't know what you're doing)"
+msgstr "Критичні налаштунки (НІ В ЯКОМУ РАЗУ не чіпайте, якщо не впевнені, що робите)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_perfomance.cpp:164
+msgid "Disable logging in game (do not enable)"
+msgstr "Вимкнути ведення логу у грі (не вмикати)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:45
+msgid "Show gender"
+msgstr "Показувати стать"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:49
+msgid "Show level"
+msgstr "Показувати рівень"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:53
+msgid "Show own name"
+msgstr "Показувати особисте ім'я"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:57
+msgid "Enable extended mouse targeting"
+msgstr "Ввімкнути розширене наведення миші"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:61
+msgid "Target dead players"
+msgstr "Дозволити наводити фокус на мертвих гравців"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:65
+msgid "Visible names"
+msgstr "Видимі імена"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:69
+msgid "Auto move names"
+msgstr "Автоматичне переупорядкування імен гравців"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:73
+msgid "Secure trades"
+msgstr "Захистити торгівлю"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:77
+msgid "Unsecure chars in names"
+msgstr "Небезпечні символи в іменах"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:81
+msgid "Show statuses"
+msgstr "Відображати статуси"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:85
+msgid "Show ip addresses on screenshots"
+msgstr "Додавати IP адреси до скріншоту (ГМ)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:89
+msgid "Allow self heal with mouse click"
+msgstr "Лікувати самого себе за кліком миші"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:93
+msgid "Group friends in who is online window"
+msgstr "Відокремлювати приятелів у вікні \"Хто онлайн\""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:97
+msgid "Hide erased players nicks"
+msgstr "Ховати імена стертих гравців"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:101
+msgid "Use special diagonal speed in players moving"
+msgstr "Вжити спеціальну діагональну швидкість під час руху"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:105
+msgid ""
+"Emulate right mouse button by long mouse click (useful for touch interfaces)"
+msgstr "Емуляція правого кліку миші подовженим лівим кліком (вживане на тач інтерфейсах)"
+
+#. TRANSLATORS: relations table header
+#. TRANSLATORS: bot checker window table header
+#: src/gui/widgets/tabs/setup_relations.cpp:58
+#: src/gui/windows/botcheckerwindow.cpp:87
+msgid "Name"
+msgstr "Назва"
+
+#. TRANSLATORS: relations table header
+#: src/gui/widgets/tabs/setup_relations.cpp:60
+msgid "Relation"
+msgstr "Стосунки"
+
+#. TRANSLATORS: relation dialog button
+#: src/gui/widgets/tabs/setup_relations.cpp:72
+msgid "Allow trading"
+msgstr "Дозволити торгівлю"
+
+#. TRANSLATORS: relation dialog button
+#: src/gui/widgets/tabs/setup_relations.cpp:75
+msgid "Allow whispers"
+msgstr "Дозволити шепіт (приватне спілкування)"
+
+#. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: input action name
+#: src/gui/widgets/tabs/setup_relations.cpp:77
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/serverdialog.cpp:132 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:91
+#: src/input/pages/gui.cpp:111
+msgid "Delete"
+msgstr "Видалити"
+
+#. TRANSLATORS: relation dialog name
+#: src/gui/widgets/tabs/setup_relations.cpp:82
+msgid "Relations"
+msgstr "Стосунки"
+
+#. TRANSLATORS: relation dialog label
+#: src/gui/widgets/tabs/setup_relations.cpp:107
+msgid "When ignoring:"
+msgstr "Коли ігнорується:"
+
+#. TRANSLATORS: theme settings label
+#: src/gui/widgets/tabs/setup_theme.cpp:64
+msgid "Gui theme"
+msgstr "Тема GUI"
+
+#. TRANSLATORS: theme settings label
+#: src/gui/widgets/tabs/setup_theme.cpp:71
+msgid "Main Font"
+msgstr "Загальний шрифт"
+
+#. TRANSLATORS: theme settings label
+#: src/gui/widgets/tabs/setup_theme.cpp:76
+msgid "Language"
+msgstr "Мова"
+
+#. TRANSLATORS: theme settings label
+#. TRANSLATORS: font size
+#: src/gui/widgets/tabs/setup_theme.cpp:80 src/gui/windows/emotewindow.cpp:49
+msgid "Bold font"
+msgstr "Жирний шрифт"
+
+#. TRANSLATORS: theme settings label
+#: src/gui/widgets/tabs/setup_theme.cpp:84
+msgid "Particle font"
+msgstr "Шрифт частинок"
+
+#. TRANSLATORS: theme settings label
+#: src/gui/widgets/tabs/setup_theme.cpp:88
+msgid "Help font"
+msgstr "Шрифт довідки"
+
+#. TRANSLATORS: theme settings label
+#: src/gui/widgets/tabs/setup_theme.cpp:92
+msgid "Secure font"
+msgstr "Безпечний шрифт"
+
+#. TRANSLATORS: theme settings label
+#: src/gui/widgets/tabs/setup_theme.cpp:96
+msgid "Npc font"
+msgstr "Шрифт NPC"
+
+#. TRANSLATORS: theme settings label
+#: src/gui/widgets/tabs/setup_theme.cpp:100
+msgid "Japanese font"
+msgstr "Японський шрифт"
+
+#. TRANSLATORS: theme settings label
+#: src/gui/widgets/tabs/setup_theme.cpp:104
+msgid "Chinese font"
+msgstr "Китайський шрифт"
+
+#. TRANSLATORS: theme settings label
+#: src/gui/widgets/tabs/setup_theme.cpp:109
+msgid "Font size"
+msgstr "Розмір шрифта"
+
+#. TRANSLATORS: theme settings label
+#: src/gui/widgets/tabs/setup_theme.cpp:114
+msgid "Npc font size"
+msgstr "Розмір шрифта NPC"
+
+#. TRANSLATORS: button name with information about selected theme
+#: src/gui/widgets/tabs/setup_theme.cpp:118
+msgid "i"
+msgstr "Інфо"
+
+#. TRANSLATORS: theme info dialog
+#: src/gui/widgets/tabs/setup_theme.cpp:244
+msgid "Name: "
+msgstr "Ім'я: "
+
+#: src/gui/widgets/tabs/setup_theme.cpp:245
+msgid "Copyright:"
+msgstr "Авторське право:"
+
+#. TRANSLATORS: theme info dialog header
+#: src/gui/widgets/tabs/setup_theme.cpp:310
+msgid "Theme info"
+msgstr "Про тему"
+
+#. TRANSLATORS: theme message dialog
+#: src/gui/widgets/tabs/setup_theme.cpp:340
+msgid "Theme Changed"
+msgstr "Дата модифікації"
+
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_theme.cpp:340
+#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:396
+msgid "Restart your client for the change to take effect."
+msgstr "Перезавантажте клієнт, щоб застосувати зміни."
+
+#. TRANSLATORS: onscreen button size
+#: src/gui/widgets/tabs/setup_touch.cpp:42
+msgid "Small"
+msgstr "Мала"
+
+#. TRANSLATORS: onscreen button size
+#: src/gui/widgets/tabs/setup_touch.cpp:46
+msgid "Medium"
+msgstr "Середня"
+
+#. TRANSLATORS: onscreen button size
+#: src/gui/widgets/tabs/setup_touch.cpp:48
+msgid "Large"
+msgstr "Велика"
+
+#. TRANSLATORS: touch settings tab
+#: src/gui/widgets/tabs/setup_touch.cpp:69
+msgid "Touch"
+msgstr "Торкання"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_touch.cpp:78
+msgid "Onscreen keyboard"
+msgstr "Екранна клавіатура"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_touch.cpp:81
+msgid "Show onscreen keyboard icon"
+msgstr "Показати значок екранної клавіатури"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_touch.cpp:85
+msgid "Keyboard icon action"
+msgstr "Дія значка клавіатури"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_touch.cpp:91
+msgid "Onscreen joystick"
+msgstr "Екранний джойстик"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_touch.cpp:94
+msgid "Show onscreen joystick"
+msgstr "Показати екранний джойстик"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_touch.cpp:98
+msgid "Joystick size"
+msgstr "Розмір джойстику"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_touch.cpp:103
+msgid "Onscreen buttons"
+msgstr "Екранні кнопки"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_touch.cpp:106
+msgid "Show onscreen buttons"
+msgstr "Показати екранні кнопки"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_touch.cpp:110
+msgid "Buttons format"
+msgstr "Формат кнопок"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_touch.cpp:114
+msgid "Buttons size"
+msgstr "Розмір кнопок"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_touch.cpp:122
+#, c-format
+msgid "Button %u action"
+msgstr "Дія кнопки %u"
+
+#. TRANSLATORS: video settings checkbox
+#: src/gui/widgets/tabs/setup_video.cpp:70
+msgid "Full screen"
+msgstr "На повний екран"
+
+#. TRANSLATORS: video settings checkbox
+#: src/gui/widgets/tabs/setup_video.cpp:73
+msgid "FPS limit:"
+msgstr "Обмеження частоти кадрів:"
+
+#. TRANSLATORS: video settings label
+#: src/gui/widgets/tabs/setup_video.cpp:78
+#: src/gui/widgets/tabs/setup_video.cpp:120
+#: src/gui/widgets/tabs/setup_video.cpp:313
+#: src/gui/widgets/tabs/setup_video.cpp:449
+msgid "Alt FPS limit: "
+msgstr "Альтернативний FPS ліміт: "
+
+#. TRANSLATORS: video settings button
+#: src/gui/widgets/tabs/setup_video.cpp:81
+msgid "Detect best mode"
+msgstr "Визначити кращій режим"
+
+#. TRANSLATORS: video settings checkbox
+#: src/gui/widgets/tabs/setup_video.cpp:90
+msgid "Show cursor"
+msgstr "Показувати вказівник"
+
+#. TRANSLATORS: video settings checkbox
+#: src/gui/widgets/tabs/setup_video.cpp:93
+msgid "Custom cursor"
+msgstr "Гарний вказівник"
+
+#. TRANSLATORS: video settings checkbox
+#: src/gui/widgets/tabs/setup_video.cpp:97
+msgid "Enable resize"
+msgstr "Дозволити змінювати розмір клієнту"
+
+#. TRANSLATORS: video settings checkbox
+#: src/gui/widgets/tabs/setup_video.cpp:100
+msgid "No frame"
+msgstr "Без рамки"
+
+#. TRANSLATORS: video settings label
+#: src/gui/widgets/tabs/setup_video.cpp:117
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:311
+#: src/gui/widgets/tabs/setup_video.cpp:433
+#: src/gui/widgets/tabs/setup_video.cpp:446
+msgid "None"
+msgstr "Ні"
+
+#. TRANSLATORS: video error message
+#: src/gui/widgets/tabs/setup_video.cpp:225
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "Не вдалося встановити режим і відновити попередній!"
+
+#. TRANSLATORS: video error message
+#: src/gui/widgets/tabs/setup_video.cpp:232
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr "Не вдалося встановити режим і відновити попередній!"
+
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:244
+msgid "Switching to Full Screen"
+msgstr "Перемикання на повний екран"
+
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:246
+msgid "Restart needed for changes to take effect."
+msgstr "Потрібно перезапустити для застосування змін."
+
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:268
+msgid "Changing to OpenGL"
+msgstr "Перемикання OpenGL"
+
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:270
+msgid "Applying change to OpenGL requires restart."
+msgstr "Потрібно перезапустити для застосування змін OpenGL."
+
+#. TRANSLATORS: resolution question dialog
+#: src/gui/widgets/tabs/setup_video.cpp:352
+msgid "Custom resolution (example: 1024x768)"
+msgstr "Користовацька роздільність (наприклад, 1024x768)"
+
+#. TRANSLATORS: resolution question dialog
+#: src/gui/widgets/tabs/setup_video.cpp:354
+msgid "Enter new resolution:                "
+msgstr "Введіть нову роздільність:           "
+
+#. TRANSLATORS: video settings warning
+#: src/gui/widgets/tabs/setup_video.cpp:381
+#: src/gui/widgets/tabs/setup_video.cpp:394
+msgid "Screen Resolution Changed"
+msgstr "Розподільчу здатність встановлено"
+
+#: src/gui/widgets/tabs/setup_video.cpp:384
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr "Вікна можуть змінювати позиції при зменшені розміру клієнту."
+
+#. TRANSLATORS: speach type
+#: src/gui/widgets/tabs/setup_visual.cpp:43
+msgid "No text"
+msgstr "Без тексту"
+
+#. TRANSLATORS: speach type
+#: src/gui/widgets/tabs/setup_visual.cpp:45
+msgid "Text"
+msgstr "Текст"
+
+#. TRANSLATORS: speach type
+#: src/gui/widgets/tabs/setup_visual.cpp:47
+msgid "Bubbles, no names"
+msgstr "Лише бульбашки, без імен"
+
+#. TRANSLATORS: speach type
+#: src/gui/widgets/tabs/setup_visual.cpp:49
+msgid "Bubbles with names"
+msgstr "Бульбашки та імена"
+
+#. TRANSLATORS: ambient effect type
+#. TRANSLATORS: vsync type
+#: src/gui/widgets/tabs/setup_visual.cpp:57
+#: src/gui/widgets/tabs/setup_visual.cpp:83
+msgid "off"
+msgstr "вимкнено"
+
+#. TRANSLATORS: patricle effects type
+#: src/gui/widgets/tabs/setup_visual.cpp:69
+msgid "best quality"
+msgstr "краща якість"
+
+#. TRANSLATORS: patricle effects type
+#: src/gui/widgets/tabs/setup_visual.cpp:71
+msgid "normal"
+msgstr "нормально"
+
+#. TRANSLATORS: patricle effects type
+#: src/gui/widgets/tabs/setup_visual.cpp:73
+msgid "best performance"
+msgstr "краща продуктивність"
+
+#. TRANSLATORS: vsync type
+#: src/gui/widgets/tabs/setup_visual.cpp:85
+msgid "on"
+msgstr "вкл."
+
+#. TRANSLATORS: settings tab name
+#: src/gui/widgets/tabs/setup_visual.cpp:98
+msgid "Visual"
+msgstr "Графіка"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:107
+#: src/gui/widgets/tabs/setup_visual.cpp:115
+msgid "Scale"
+msgstr "Збільшення"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:119
+msgid "Notifications"
+msgstr "Сповіщення"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:122
+msgid "Show pickup notifications in chat"
+msgstr "Повідомляти, коли піднято предмет"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:126
+msgid "Show pickup notifications as particle effects"
+msgstr "Показувати сповіщення про підняття як ефект частинок"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:130
+msgid "Effects"
+msgstr "Ефекти"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:134
+msgid "Grab mouse and keyboard input"
+msgstr "Захопити введення клавіатури і миші"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:139
+msgid "Blurring textures (OpenGL)"
+msgstr "Розмивати текстури (OpenGL)"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:143
+msgid "Gui opacity"
+msgstr "Прозорість інтерфейсу"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:148
+msgid "Overhead text"
+msgstr "Текст зверху"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:153
+msgid "Ambient FX"
+msgstr "Ефекти оточення"
+
+#. TRANSLATORS: particle details
+#: src/gui/widgets/tabs/setup_visual.cpp:167
+msgid "max"
+msgstr "максимальний"
+
+#: src/gui/widgets/tabs/setup_visual.cpp:168
+msgid "Particle detail"
+msgstr "Деталізація ефектів частинок"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:175
+msgid "Particle physics"
+msgstr "Фізика частинок"
+
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:180
+#: src/gui/widgets/tabs/setup_visual.cpp:187
+msgid "Gamma"
+msgstr "Гама"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:183
+msgid "Enable gamma control"
+msgstr "Ввімкнути корегування гами"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:196
+msgid "Vsync"
+msgstr "Вертикальна синхронізація"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:201
+msgid "Center game window"
+msgstr "Змістити вікно до центра"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:206
+msgid "Allow screensaver to run"
+msgstr "Дозволити скрінсейвер"
+
+#. TRANSLATORS: settings group
+#: src/gui/widgets/tabs/setup_visual.cpp:211
+msgid "Screenshots"
+msgstr "Скріншоти"
+
+#: src/gui/widgets/tabs/setup_visual.cpp:213
+msgid "Add water mark into screenshots"
+msgstr "Додати водяний знак до скріншоту"
+
+#. TRANSLATORS: Attack filter tab name in social window.
+#. TRANSLATORS: Should be small
+#: src/gui/widgets/tabs/socialattacktab.h:51
+msgid "Atk"
+msgstr "Атк"
+
+#. TRANSLATORS: mobs group name in social window
+#: src/gui/widgets/tabs/socialattacktab.h:67
+msgid "Priority mobs"
+msgstr "Пріоритет мобів"
+
+#. TRANSLATORS: mobs group name in social window
+#: src/gui/widgets/tabs/socialattacktab.h:69
+msgid "Attack mobs"
+msgstr "Звичайні"
+
+#. TRANSLATORS: mobs group name in social window
+#: src/gui/widgets/tabs/socialattacktab.h:71
+msgid "Ignore mobs"
+msgstr "Ігноровані"
+
+#. TRANSLATORS: social window label
+#: src/gui/widgets/tabs/socialfriendstab.h:119
+#, c-format
+msgid "Friends: %u/%u"
+msgstr "Друзів: %u/%u"
+
+#. TRANSLATORS: social window label
+#: src/gui/widgets/tabs/socialguildtab2.h:95
+#: src/gui/widgets/tabs/socialguildtab.h:166
+#: src/gui/widgets/tabs/socialpartytab.h:158
+#, c-format
+msgid "Players: %u/%u"
+msgstr "Гравців: %u/%u"
+
+#. TRANSLATORS: chat message
+#: src/gui/widgets/tabs/socialguildtab.h:84
+#, c-format
+msgid "Invited user %s to guild %s."
+msgstr "Запрошено гравця %s до гільдії %s."
+
+#: src/gui/widgets/tabs/socialguildtab.h:102
+#, c-format
+msgid "Guild %s quit requested."
+msgstr "Запит на вихід з гільдії %s подано."
+
+#. TRANSLATORS: guild invite message
+#: src/gui/widgets/tabs/socialguildtab.h:117
+msgid "Member Invite to Guild"
+msgstr "Запрошення в гільдію"
+
+#. TRANSLATORS: guild invite message
+#: src/gui/widgets/tabs/socialguildtab.h:119
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr "Кого ви бажаєте запросити до гільдії %s?"
+
+#. TRANSLATORS: guild leave message
+#: src/gui/widgets/tabs/socialguildtab.h:129
+msgid "Leave Guild?"
+msgstr "Залишити гільдію?"
+
+#. TRANSLATORS: guild leave message
+#: src/gui/widgets/tabs/socialguildtab.h:131
+#, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Ви дійсно хочете вийти з гільдії %s?"
+
+#. TRANSLATORS: social window label
+#: src/gui/widgets/tabs/socialguildtab.h:142
+#, c-format
+msgid "Members: %u/%u"
+msgstr "Членів: %u/%u"
+
+#. TRANSLATORS: Navigation tab name in social window.
+#. TRANSLATORS: Should be small
+#: src/gui/widgets/tabs/socialnavigationtab.h:60
+msgid "Nav"
+msgstr "Нав"
+
+#. TRANSLATORS: social window label
+#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#, c-format
+msgid "Portals: %u/%u"
+msgstr "Телепортів: %u/%u"
+
+#: src/gui/widgets/tabs/socialpartytab.h:85
+#, c-format
+msgid "Invited user %s to party."
+msgstr "Запрошено гравця %s до групи."
+
+#: src/gui/widgets/tabs/socialpartytab.h:102
+#, c-format
+msgid "Party %s quit requested."
+msgstr "Запит на вихід з групи %s подано."
+
+#. TRANSLATORS: party invite message
+#: src/gui/widgets/tabs/socialpartytab.h:117
+msgid "Member Invite to Party"
+msgstr "Запросити гравця до групи"
+
+#. TRANSLATORS: party invite message
+#: src/gui/widgets/tabs/socialpartytab.h:119
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr "Кого ви бажаєте запросити до групи %s?"
+
+#. TRANSLATORS: party leave message
+#: src/gui/widgets/tabs/socialpartytab.h:129
+msgid "Leave Party?"
+msgstr "Вийти з групи?"
+
+#. TRANSLATORS: party leave message
+#: src/gui/widgets/tabs/socialpartytab.h:131
+#, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Ви дійсно хочете вийти з групи %s?"
+
+#. TRANSLATORS: Pickup filter tab name in social window.
+#. TRANSLATORS: Should be small
+#: src/gui/widgets/tabs/socialpickuptab.h:51
+msgid "Pik"
+msgstr "Підн"
+
+#. TRANSLATORS: items group name in social window
+#: src/gui/widgets/tabs/socialpickuptab.h:67
+msgid "Pickup items"
+msgstr "Піднімати предмети"
+
+#. TRANSLATORS: items group name in social window
+#: src/gui/widgets/tabs/socialpickuptab.h:69
+msgid "Ignore items"
+msgstr "Ігнорувати предмети"
+
+#. TRANSLATORS: social window label
+#: src/gui/widgets/tabs/socialplayerstab.h:194
+#, c-format
+msgid "Visible players: %d"
+msgstr "Видимих гравців: %d"
+
+#. TRANSLATORS: short button name for who is online window.
+#: src/gui/windowmenu.cpp:70
+msgid "ONL"
+msgstr "ХО"
+
+#: src/gui/windowmenu.cpp:71
+msgid "Who is online"
+msgstr "Хто онлайн"
+
+#. TRANSLATORS: short button name for help window.
+#: src/gui/windowmenu.cpp:73
+msgid "HLP"
+msgstr "ДОВ"
+
+#. TRANSLATORS: short button name for quests window.
+#: src/gui/windowmenu.cpp:76
+msgid "QE"
+msgstr "КВ"
+
+#. TRANSLATORS: quests window name
+#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:65
+msgid "Quests"
+msgstr "Квести"
+
+#. TRANSLATORS: short button name for bot checker window.
+#: src/gui/windowmenu.cpp:79
+msgid "BC"
+msgstr "ПБ"
+
+#: src/gui/windowmenu.cpp:80
+msgid "Bot checker"
+msgstr "Перевірка ботів"
+
+#. TRANSLATORS: short button name for kill stats window.
+#: src/gui/windowmenu.cpp:82
+msgid "KS"
+msgstr "СА"
+
+#. TRANSLATORS: kill stats window name
+#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:49
+msgid "Kill stats"
+msgstr "Статистика атак"
+
+#: src/gui/windowmenu.cpp:85
+msgid "Smilies"
+msgstr "Смайлики"
+
+#. TRANSLATORS: short button name for chat window.
+#: src/gui/windowmenu.cpp:87
+msgid "CH"
+msgstr "ЧАТ"
+
+#. TRANSLATORS: short button name for status window.
+#: src/gui/windowmenu.cpp:95
+msgid "STA"
+msgstr "СТН"
+
+#: src/gui/windowmenu.cpp:96
+msgid "Status"
+msgstr "Стан"
+
+#. TRANSLATORS: short button name for equipment window.
+#: src/gui/windowmenu.cpp:98
+msgid "EQU"
+msgstr "СПР"
+
+#. TRANSLATORS: equipment window name
+#. TRANSLATORS: inventory button
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/windows/inventorywindow.cpp:196
+msgid "Equipment"
+msgstr "Спорядження"
+
+#. TRANSLATORS: short button name for inventory window.
+#: src/gui/windowmenu.cpp:101
+msgid "INV"
+msgstr "СУМ"
+
+#. TRANSLATORS: inventory window name
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:131
+#: src/inventory.cpp:299
+msgid "Inventory"
+msgstr "Сумка"
+
+#. TRANSLATORS: short button name for map window.
+#: src/gui/windowmenu.cpp:104
+msgid "MAP"
+msgstr "МАП"
+
+#. TRANSLATORS: short button name for skills window.
+#: src/gui/windowmenu.cpp:110
+msgid "SKI"
+msgstr "ВМІ"
+
+#. TRANSLATORS: skills dialog name
+#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:73
+msgid "Skills"
+msgstr "Вміння"
+
+#. TRANSLATORS: short button name for social window.
+#: src/gui/windowmenu.cpp:115
+msgid "SOC"
+msgstr "СУС"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: social window name
+#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+msgid "Social"
+msgstr "Спільнота"
+
+#. TRANSLATORS: short button name for shortcuts window.
+#: src/gui/windowmenu.cpp:119
+msgid "SH"
+msgstr "ШП"
+
+#. TRANSLATORS: short button name for spells window.
+#: src/gui/windowmenu.cpp:123
+msgid "SP"
+msgstr "ЗК"
+
+#. TRANSLATORS: short button name for drops window.
+#: src/gui/windowmenu.cpp:127
+msgid "DR"
+msgstr "ДР"
+
+#. TRANSLATORS: short button name for did you know window.
+#: src/gui/windowmenu.cpp:131
+msgid "YK"
+msgstr "ЧВВ"
+
+#. TRANSLATORS: full button name
+#: src/gui/windowmenu.cpp:133
+msgid "Did you know"
+msgstr "Чи вам відомо"
+
+#. TRANSLATORS: short button name for shop window.
+#: src/gui/windowmenu.cpp:135
+msgid "SHP"
+msgstr "КРА"
+
+#. TRANSLATORS: short button name for outfits window.
+#: src/gui/windowmenu.cpp:139
+msgid "OU"
+msgstr "ШС"
+
+#. TRANSLATORS: short button name for updates window.
+#: src/gui/windowmenu.cpp:143
+msgid "UP"
+msgstr "ОН"
+
+#. TRANSLATORS: full button name
+#: src/gui/windowmenu.cpp:145
+msgid "Updates"
+msgstr "Оновлення"
+
+#. TRANSLATORS: short button name for bank window.
+#: src/gui/windowmenu.cpp:147
+msgid "BA"
+msgstr "БА"
+
+#. TRANSLATORS: full button name
+#. TRANSLATORS: bank window name
+#: src/gui/windowmenu.cpp:149 src/gui/windows/bankwindow.cpp:43
+msgid "Bank"
+msgstr "Банк"
+
+#. TRANSLATORS: short button name for debug window.
+#: src/gui/windowmenu.cpp:151
+msgid "DBG"
+msgstr "ЗНВ"
+
+#. TRANSLATORS: short button name for windows list menu.
+#: src/gui/windowmenu.cpp:160
+msgid "WIN"
+msgstr "ВІК"
+
+#. TRANSLATORS: short button name for setup window.
+#: src/gui/windowmenu.cpp:164
+msgid "SET"
+msgstr "НАЛ"
+
+#. TRANSLATORS: short key name
+#. TRANSLATORS: outfits window label
+#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:571
+#, c-format
+msgid "Key: %s"
+msgstr "Клавіша: %s"
+
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:90
+#, c-format
+msgid "Money in bank: %s"
+msgstr "Рахунок у банку: %s"
+
+#. TRANSLATORS: bank window button
+#: src/gui/windows/bankwindow.cpp:51
+msgid "Withdraw"
+msgstr "Зняти"
+
+#. TRANSLATORS: bank window button
+#: src/gui/windows/bankwindow.cpp:53
+msgid "Deposit"
+msgstr "Покласти"
+
+#. TRANSLATORS: bot checker window header
+#: src/gui/windows/botcheckerwindow.cpp:45
+msgid "Bot Checker"
+msgstr "Перевірка ботів"
+
+#. TRANSLATORS: bot checker window button
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/botcheckerwindow.cpp:54 src/gui/windows/npcdialog.cpp:116
+msgid "Reset"
+msgstr "Скинути"
+
+#. TRANSLATORS: bot checker window table header
+#: src/gui/windows/botcheckerwindow.cpp:95
+msgid "Result"
+msgstr "Результат"
+
+#. TRANSLATORS: buy dialog name
+#: src/gui/windows/buydialog.cpp:169
+msgid "Create items"
+msgstr "Створення предметів"
+
+#. TRANSLATORS: buy dialog label
+#: 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:262 src/gui/windows/charcreatedialog.cpp:127
+#: src/gui/windows/charselectdialog.cpp:601
+#: src/gui/windows/socialwindow.cpp:85
+msgid "Create"
+msgstr "Створити"
+
+#. TRANSLATORS: change email dialog header
+#. TRANSLATORS: button in change email dialog
+#: src/gui/windows/changeemaildialog.cpp:50
+#: src/gui/windows/changeemaildialog.cpp:55
+msgid "Change Email Address"
+msgstr "Змінити адресу електронної пошти"
+
+#. TRANSLATORS: label in change email dialog
+#. TRANSLATORS: change password dialog label
+#: src/gui/windows/changeemaildialog.cpp:63
+#: src/gui/windows/changepassworddialog.cpp:66
+#, c-format
+msgid "Account: %s"
+msgstr "Акаунт: %s"
+
+#. TRANSLATORS: label in change email dialog
+#: src/gui/windows/changeemaildialog.cpp:67
+msgid "Type new email address twice:"
+msgstr "Двічі введіть вашу нову адресу електронної пошти:"
+
+#. TRANSLATORS: change email error
+#: src/gui/windows/changeemaildialog.cpp:139
+#, c-format
+msgid "The new email address needs to be at least %u characters long."
+msgstr "Нова імейл адреса повинна складатись хоча б з %u символів."
+
+#. TRANSLATORS: change email error
+#: src/gui/windows/changeemaildialog.cpp:147
+#, c-format
+msgid "The new email address needs to be less than %u characters long."
+msgstr "Нова імейл адреса повинна складатись хоча б з %u символів."
+
+#. TRANSLATORS: change email error
+#: src/gui/windows/changeemaildialog.cpp:155
+msgid "The email address entries mismatch."
+msgstr "Адреси скриньок не спідпадають!"
+
+#. TRANSLATORS: change password window name
+#. TRANSLATORS: change password dialog button
+#: src/gui/windows/changepassworddialog.cpp:51
+#: src/gui/windows/changepassworddialog.cpp:57
+msgid "Change Password"
+msgstr "Змінити пароль"
+
+#. TRANSLATORS: change password dialog label
+#. TRANSLATORS: login dialog label
+#. TRANSLATORS: register dialog. label.
+#. TRANSLATORS: unregister dialog. label.
+#: src/gui/windows/changepassworddialog.cpp:70
+#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/unregisterdialog.cpp:68
+msgid "Password:"
+msgstr "Пароль:"
+
+#. TRANSLATORS: change password dialog label
+#: src/gui/windows/changepassworddialog.cpp:73
+msgid "Type new password twice:"
+msgstr "Введіть новий пароль двічі:"
+
+#. TRANSLATORS: change password error
+#: src/gui/windows/changepassworddialog.cpp:120
+msgid "Enter the old password first."
+msgstr "Спочатку старий пароль."
+
+#. TRANSLATORS: change password error
+#: src/gui/windows/changepassworddialog.cpp:127
+#, c-format
+msgid "The new password needs to be at least %u characters long."
+msgstr "Пароль повинен складатись мінімум з %u символів."
+
+#. TRANSLATORS: change password error
+#: src/gui/windows/changepassworddialog.cpp:135
+#, c-format
+msgid "The new password needs to be less than %u characters long."
+msgstr "Пароль повинен складатись менш, ніж з %u символів."
+
+#. TRANSLATORS: change password error
+#: src/gui/windows/changepassworddialog.cpp:143
+msgid "The new password entries mismatch."
+msgstr "Вказані паролі не співпадають!"
+
+#. TRANSLATORS: char create dialog name
+#: src/gui/windows/charcreatedialog.cpp:77
+msgid "New Character"
+msgstr "Новий персонаж"
+
+#. TRANSLATORS: char create dialog label
+#. TRANSLATORS: edit server dialog label
+#. TRANSLATORS: login dialog label
+#. TRANSLATORS: register dialog. label.
+#: 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:"
+msgstr "Ім'я:"
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: outfits window button
+#: 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 "▶"
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: outfits window button
+#: 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:93
+msgid "Hair color:"
+msgstr "Колір волосся:"
+
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "Hair style:"
+msgstr "Зачіска:"
+
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:111
+msgid "^"
+msgstr "▲"
+
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: register dialog. button.
+#: src/gui/windows/charcreatedialog.cpp:115
+#: src/gui/windows/registerdialog.cpp:98
+msgid "Male"
+msgstr "Чоловік"
+
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: register dialog. button.
+#: src/gui/windows/charcreatedialog.cpp:117
+#: src/gui/windows/registerdialog.cpp:100
+msgid "Female"
+msgstr "Жінка"
+
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:125
+#: src/gui/windows/charcreatedialog.cpp:481
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Будь ласка, розподіліть %d балів"
+
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:197
+msgid "Race:"
+msgstr "Раса:"
+
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:207
+msgid "Look:"
+msgstr "Вигляд:"
+
+#. TRANSLATORS: char creation error
+#: src/gui/windows/charcreatedialog.cpp:371
+msgid "Your name needs to be at least 4 characters."
+msgstr "Ім'я повинно містити принаймні 4 символи."
+
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:471
+msgid "Character stats OK"
+msgstr "Характеристики персонажа в нормі"
+
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:487
+#, c-format
+msgid "Please remove %d points"
+msgstr "Будь ласка, видаліть %d балів"
+
+#. TRANSLATORS: char deletion message
+#: src/gui/windows/chardeleteconfirm.h:41
+msgid "Confirm Character Delete"
+msgstr "Підтвердіть видалення персонажа"
+
+#. TRANSLATORS: char deletion message
+#: src/gui/windows/chardeleteconfirm.h:43
+msgid "Are you sure you want to delete this character?"
+msgstr "Ви дійсно бажаєте знищити персонажа?"
+
+#. TRANSLATORS: char select dialog name
+#: src/gui/windows/charselectdialog.cpp:64
+#, c-format
+msgid "Account %s (last login time %s)"
+msgstr "Акаунт %s (останній логін %s)"
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:71
+msgid "Switch"
+msgstr "Назад до логіну"
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Password"
+msgstr "Пароль"
+
+#. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: updater window button
+#: src/gui/windows/charselectdialog.cpp:78
+#: src/gui/windows/charselectdialog.cpp:591
+#: src/gui/windows/updaterwindow.cpp:193
+msgid "Play"
+msgstr "Увійти"
+
+#. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: info message
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:539
+#: src/net/eathena/charserverhandler.cpp:569
+msgid "Info"
+msgstr "Відомості"
+
+#. TRANSLATORS: char select dialog. button.
+#. TRANSLATORS: unregister dialog name
+#. TRANSLATORS: unregister dialog. button.
+#: src/gui/windows/charselectdialog.cpp:108
+#: src/gui/windows/unregisterdialog.cpp:50
+#: src/gui/windows/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Видалити"
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:120
+msgid "Change Email"
+msgstr "Змінити адресу електронної пошти"
+
+#. TRANSLATORS: char select dialog name
+#: src/gui/windows/charselectdialog.cpp:164
+#, c-format
+msgid "Account %s"
+msgstr "Акаунт %s"
+
+#: src/gui/windows/charselectdialog.cpp:192
+msgid "Please set new pincode"
+msgstr "Будь ласка, встановіть новий пін код"
+
+#: src/gui/windows/charselectdialog.cpp:238
+msgid "Please enter new name"
+msgstr "Будь ласка, вкажіть нове ім'я"
+
+#. TRANSLATORS: char select dialog. player info message.
+#: src/gui/windows/charselectdialog.cpp:257
+#, c-format
+msgid ""
+"Hp: %u/%u\n"
+"Mp: %u/%u\n"
+"Level: %u\n"
+"Experience: %u\n"
+"Money: %s"
+msgstr "Hp: %u/%u\nMp: %u/%u\nРівень: %u\nДосвід: %u\nКошти: %s"
+
+#: src/gui/windows/charselectdialog.cpp:309
+msgid "Incorrect password"
+msgstr "Неправильний пароль!"
+
+#. TRANSLATORS: char deletion question.
+#: src/gui/windows/charselectdialog.cpp:449
+msgid "Enter password for deleting character"
+msgstr "Вкажіть пароль для видалення персонажу"
+
+#: src/gui/windows/charselectdialog.cpp:449
+msgid "Enter password:"
+msgstr "Пароль:"
+
+#. TRANSLATORS: chat message
+#: src/gui/windows/chatwindow.cpp:660
+#, c-format
+msgid "Present: %s; %d players are present."
+msgstr "Присутні: %s; %d гравців онлайн."
+
+#. TRANSLATORS: chat message
+#: src/gui/windows/chatwindow.cpp:1103
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Шепчу до %s: %s"
+
+#. TRANSLATORS: owners pet name. For example: 4144's pet
+#: src/gui/windows/chatwindow.cpp:1678 src/net/eathena/pethandler.cpp:166
+#, c-format
+msgid "%s's pet"
+msgstr "%s'ів улюбленець"
+
+#. TRANSLATORS: confirm dialog button
+#: src/gui/windows/confirmdialog.cpp:55
+msgid "Yes"
+msgstr "Так"
+
+#. TRANSLATORS: debug window tab
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Ціль"
+
+#. TRANSLATORS: debug window tab
+#: src/gui/windows/debugwindow.cpp:65
+msgid "Net"
+msgstr "Мережа"
+
+#. TRANSLATORS: did you know window name
+#: src/gui/windows/didyouknowwindow.cpp:53
+msgid "Did You Know?"
+msgstr "Чи вам відомо"
+
+#. TRANSLATORS: did you know window button
+#: src/gui/windows/didyouknowwindow.cpp:60
+msgid "< Previous"
+msgstr "◀ попереднє"
+
+#. TRANSLATORS: did you know window button
+#: src/gui/windows/didyouknowwindow.cpp:62
+msgid "Next >"
+msgstr "наступне ▶"
+
+#. TRANSLATORS: did you know window checkbox
+#: src/gui/windows/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr "Автоматично відкривати це вікно"
+
+#. TRANSLATORS: edit server dialog name
+#: src/gui/windows/editserverdialog.cpp:48
+msgid "Edit Server"
+msgstr "Редагувати сервер"
+
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: servers dialog button
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:126
+msgid "Connect"
+msgstr "З'єднання"
+
+#. TRANSLATORS: edit server dialog label
+#: src/gui/windows/editserverdialog.cpp:63
+msgid "Use same ip"
+msgstr "Вжити той самий IP"
+
+#. TRANSLATORS: edit server dialog label
+#: src/gui/windows/editserverdialog.cpp:76
+msgid "Address:"
+msgstr "Адреса:"
+
+#. TRANSLATORS: edit server dialog label
+#: src/gui/windows/editserverdialog.cpp:78
+msgid "Port:"
+msgstr "Порт:"
+
+#. TRANSLATORS: edit server dialog label
+#: src/gui/windows/editserverdialog.cpp:80
+msgid "Server type:"
+msgstr "Тип серверу:"
+
+#. TRANSLATORS: edit server dialog label
+#: src/gui/windows/editserverdialog.cpp:82
+msgid "Description:"
+msgstr "Опис:"
+
+#. TRANSLATORS: edit server dialog label
+#: src/gui/windows/editserverdialog.cpp:84
+msgid "Online list url:"
+msgstr "Посилання онлайн списку:"
+
+#. TRANSLATORS: edit server dialog error message
+#: src/gui/windows/editserverdialog.cpp:214
+msgid "Please at least type both the address and the port of the server."
+msgstr "Будь ласка, надайте хоча б порт і адресу серверу."
+
+#. TRANSLATORS: egg selection dialog name
+#: src/gui/windows/eggselectiondialog.cpp:42
+#: src/gui/windows/eggselectiondialog.cpp:44
+msgid "Select egg"
+msgstr "Оберіть яйце"
+
+#. TRANSLATORS: egg selection dialog button
+#. TRANSLATORS: input action name
+#: src/gui/windows/eggselectiondialog.cpp:51 src/input/pages/gui.cpp:93
+msgid "Select"
+msgstr "Вибір"
+
+#. TRANSLATORS: font size
+#: src/gui/windows/emotewindow.cpp:47
+msgid "Normal font"
+msgstr "Нормальний шрифт"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/windows/emotewindow.cpp:119
+msgid "Fonts"
+msgstr "Шрифти"
+
+#. TRANSLATORS: help window. button.
+#: src/gui/windows/helpwindow.cpp:56
+msgid "Did you know..."
+msgstr "Чи вам відомо..."
+
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: 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
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Вдягнути"
+
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr "Поділити"
+
+#. TRANSLATORS: item amount window button
+#: src/gui/windows/itemamountwindow.cpp:162
+msgid "All"
+msgstr "Все"
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:218
+msgid "Select amount of items to trade."
+msgstr "Вкажіть кількість предметів для торгівлі."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:222
+msgid "Select amount of items to drop."
+msgstr "Вкажіть кількість предметів, щоб кинути."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:226
+msgid "Select amount of items to store."
+msgstr "Вкажіть кількість предметів для зберігання."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:230
+msgid "Select amount of items to retrieve."
+msgstr "Вкажіть кількість предметів для отримання."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:234
+msgid "Select amount of items to split."
+msgstr "Вкажіть кількість предметів для розподілу."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:238
+msgid "Add to buy shop."
+msgstr "Продавати до списку купівлі."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:242
+msgid "Add to sell shop."
+msgstr "Додати до списку продажу."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:246
+msgid "Unknown."
+msgstr "Невідомо."
+
+#. TRANSLATORS: kill stats window button
+#: src/gui/windows/killstats.cpp:54
+msgid "Reset stats"
+msgstr "Скинути характеристики"
+
+#. TRANSLATORS: kill stats window button
+#: src/gui/windows/killstats.cpp:56
+msgid "Reset timer"
+msgstr "Скинути таймер"
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:175
+#: src/gui/windows/killstats.cpp:280 src/gui/windows/killstats.cpp:521
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr "Вбито: %s, загальний досвід: %s"
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:177
+#: src/gui/windows/killstats.cpp:257 src/gui/windows/killstats.cpp:272
+#: src/gui/windows/killstats.cpp:523
+#, c-format
+msgid "Avg Exp: %s"
+msgstr "Середній досвід: %s"
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:180
+#: src/gui/windows/killstats.cpp:262 src/gui/windows/killstats.cpp:276
+#: src/gui/windows/killstats.cpp:526
+#, c-format
+msgid "No. of avg mob to next level: %s"
+msgstr "Скільки сер. мобів до наступного рівня: %s"
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:191
+#: src/gui/windows/killstats.cpp:284 src/gui/windows/killstats.cpp:529
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr "Вбивств/хв.: %s, досвід/хв.: %s"
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:350
+#: src/gui/windows/killstats.cpp:369 src/gui/windows/killstats.cpp:390
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] "Середній досвід за %d хвилину: %s"
+msgstr[1] "Середній досвід за %d хвилини: %s"
+msgstr[2] "Середній досвід за %d хвилин: %s"
+
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:86
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] "Час до наступного рівня (оцінка за %d хв.): %s"
+msgstr[1] "Час до наступного рівня (оцінка за %d хв.): %s"
+msgstr[2] "Час до наступного рівня (оцінка за %d хв.): %s"
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:289
+msgid "Last kill exp:"
+msgstr "Досвід з останнього мобу:"
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:92 src/gui/windows/killstats.cpp:421
+#: src/gui/windows/killstats.cpp:428 src/gui/windows/killstats.cpp:435
+#: src/gui/windows/killstats.cpp:441
+msgid "Time before jacko spawn:"
+msgstr "Час до повернення Джека:"
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:129 src/gui/windows/killstats.cpp:242
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr "Рівень: %d на %f%%"
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:134 src/gui/windows/killstats.cpp:247
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr "Досвід: %d/%d, залишилось: %d"
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:138 src/gui/windows/killstats.cpp:253
+#: src/gui/windows/killstats.cpp:267
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr "1%% = %d досвіду, середніх мобів для 1%%: %s"
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:356 src/gui/windows/killstats.cpp:365
+#: src/gui/windows/killstats.cpp:376 src/gui/windows/killstats.cpp:385
+#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
+#, c-format
+msgid "  Time for next level: %s"
+msgstr "  Час до наступного рівня: %s"
+
+#. TRANSLATORS: kill stats window label
+#: src/gui/windows/killstats.cpp:428
+#, c-format
+msgid "%s %d?"
+msgstr "%s %d?"
+
+#: src/gui/windows/killstats.cpp:435
+msgid "jacko spawning"
+msgstr "Джек вже поруч"
+
+#. TRANSLATORS: login dialog name
+#. TRANSLATORS: login dialog button
+#: src/gui/windows/logindialog.cpp:64 src/gui/windows/logindialog.cpp:81
+msgid "Login"
+msgstr "Логін"
+
+#. TRANSLATORS: login dialog label
+#: src/gui/windows/logindialog.cpp:71
+msgid "Remember username"
+msgstr "Запам'ятати ім'я користувача"
+
+#. TRANSLATORS: login dialog label
+#: src/gui/windows/logindialog.cpp:74
+msgid "Update:"
+msgstr "Оновлення:"
+
+#. TRANSLATORS: login dialog button
+#: src/gui/windows/logindialog.cpp:79
+msgid "Change Server"
+msgstr "Змінити сервер"
+
+#. TRANSLATORS: login dialog button
+#. TRANSLATORS: register dialog name
+#. TRANSLATORS: register dialog. button.
+#: src/gui/windows/logindialog.cpp:83 src/gui/windows/registerdialog.cpp:54
+#: src/gui/windows/registerdialog.cpp:63
+msgid "Register"
+msgstr "Реєстрація"
+
+#. TRANSLATORS: login dialog checkbox
+#: src/gui/windows/logindialog.cpp:85
+msgid "Custom update host"
+msgstr "Користувацька адреса оновлень"
+
+#. TRANSLATORS: login dialog label
+#: src/gui/windows/logindialog.cpp:100
+msgid "Server:"
+msgstr "Сервер:"
+
+#. TRANSLATORS: login dialog label
+#: src/gui/windows/logindialog.cpp:110
+#, c-format
+msgid "Update host: %s"
+msgstr "Сервер оновлень: %s"
+
+#: src/gui/windows/logindialog.cpp:229
+msgid "Open register url"
+msgstr "Відкрити посилання реєстрації"
+
+#: src/gui/windows/ministatuswindow.cpp:71
+msgid "health bar"
+msgstr "здоров'я"
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:82
+msgid "mana bar"
+msgstr "рівень мани"
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:86
+msgid "experience bar"
+msgstr "досвід"
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:91
+msgid "weight bar"
+msgstr "вага"
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:97
+msgid "inventory slots bar"
+msgstr "сумка"
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:101
+msgid "money bar"
+msgstr "гаманець"
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:105
+msgid "arrows bar"
+msgstr "стріли"
+
+#. TRANSLATORS: status bar name
+#: src/gui/windows/ministatuswindow.cpp:110
+msgid "status bar"
+msgstr "рядок стану"
+
+#: src/gui/windows/ministatuswindow.cpp:133
+msgid "job bar"
+msgstr "рівень роботи"
+
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#: src/gui/windows/ministatuswindow.cpp:340
+#: src/gui/windows/statuswindow.cpp:245
+#, c-format
+msgid "Level: %d (GM %d)"
+msgstr "Рівень: %d (ГМ %d)"
+
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#: src/gui/windows/ministatuswindow.cpp:347
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:252
+#: src/gui/windows/statuswindow.cpp:377
+#, c-format
+msgid "Level: %d"
+msgstr "Рівень: %d"
+
+#. TRANSLATORS: status bar label
+#: src/gui/windows/ministatuswindow.cpp:363
+#: src/gui/windows/ministatuswindow.cpp:400
+msgid "Need"
+msgstr "Потрібно"
+
+#. TRANSLATORS: job bar label
+#: src/gui/windows/ministatuswindow.cpp:387
+#, c-format
+msgid "Job level: %d"
+msgstr "Рівень роботи: %d"
+
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:70
+msgid "Stop waiting"
+msgstr "Зупинити очікування"
+
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:72
+msgid "Next"
+msgstr "Далі"
+
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:76
+msgid "Submit"
+msgstr "Відправити"
+
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:128
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
+#: src/gui/windows/tradewindow.cpp:83
+msgid "Add"
+msgstr "Додати"
+
+#. TRANSLATORS: label in npc post dialog
+#: src/gui/windows/npcpostdialog.cpp:59
+msgid "To:"
+msgstr "Для:"
+
+#. TRANSLATORS: button in npc post dialog
+#: src/gui/windows/npcpostdialog.cpp:66
+msgid "Send"
+msgstr "Надіслати"
+
+#. TRANSLATORS: npc post message error
+#: src/gui/windows/npcpostdialog.cpp:113
+msgid "Failed to send as sender or letter invalid."
+msgstr "Неможливо надіслати - адресант або лист некоректні."
+
+#. TRANSLATORS: sell confirmation header
+#: src/gui/windows/npcselldialog.cpp:68
+msgid "sell item"
+msgstr "продаж предмету"
+
+#. TRANSLATORS: sell confirmation message
+#: src/gui/windows/npcselldialog.cpp:70
+#, c-format
+msgid "Do you really want to sell %s?"
+msgstr "Ви дійсно бажаєте продати %s?"
+
+#. TRANSLATORS: outfits window label
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:565
+#, c-format
+msgid "Outfit: %d"
+msgstr "Швидке спорядження: %d"
+
+#. TRANSLATORS: outfits window checkbox
+#: src/gui/windows/outfitwindow.cpp:71
+msgid "Unequip first"
+msgstr "Спочатку зняти"
+
+#. TRANSLATORS: outfits window checkbox
+#: src/gui/windows/outfitwindow.cpp:74
+msgid "Away outfit"
+msgstr "Піжама"
+
+#. TRANSLATORS: quit dialog button
+#: src/gui/windows/quitdialog.cpp:62
+msgid "Switch server"
+msgstr "Змінити сервер"
+
+#. TRANSLATORS: quit dialog button
+#: src/gui/windows/quitdialog.cpp:65
+msgid "Switch character"
+msgstr "Змінити персонаж"
+
+#. TRANSLATORS: register dialog. label.
+#: src/gui/windows/registerdialog.cpp:81
+msgid "Confirm:"
+msgstr "Підтвердіть:"
+
+#. TRANSLATORS: register dialog. label.
+#: src/gui/windows/registerdialog.cpp:121
+msgid "Email:"
+msgstr "Пошта:"
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:188
+#, c-format
+msgid "The username needs to be at least %u characters long."
+msgstr "Ім'я користувача повинне складатись хоча б з %u символів."
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:197
+#, c-format
+msgid "The username needs to be less than %u characters long."
+msgstr "Ім'я користувача повинне складатись не більш, як з %u символів."
+
+#. TRANSLATORS: error message
+#. TRANSLATORS: unregister dialog. error message.
+#: src/gui/windows/registerdialog.cpp:206
+#: src/gui/windows/unregisterdialog.cpp:129
+#, c-format
+msgid "The password needs to be at least %u characters long."
+msgstr "Пароль повинен складатись мінімум з %u символів."
+
+#. TRANSLATORS: error message
+#. TRANSLATORS: unregister dialog. error message.
+#: src/gui/windows/registerdialog.cpp:215
+#: src/gui/windows/unregisterdialog.cpp:136
+#, c-format
+msgid "The password needs to be less than %u characters long."
+msgstr "Пароль повинен складатись менш, ніж з %u символів."
+
+#. TRANSLATORS: error message
+#: src/gui/windows/registerdialog.cpp:223
+msgid "Passwords do not match."
+msgstr "Неідентичні паролі!"
+
+#. TRANSLATORS: servers dialog name
+#: src/gui/windows/serverdialog.cpp:115
+msgid "Choose Your Server"
+msgstr "Оберіть сервер"
+
+#. TRANSLATORS: servers dialog button
+#: src/gui/windows/serverdialog.cpp:134
+msgid "Load"
+msgstr "Завантажити"
+
+#. TRANSLATORS: servers dialog name
+#: src/gui/windows/serverdialog.cpp:148
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Вибрати сервер  *** БЕЗПЕЧНИЙ РЕЖИМ ***"
+
+#. TRANSLATORS: servers dialog checkbox
+#: src/gui/windows/serverdialog.cpp:157
+msgid "Use same ip for game sub servers"
+msgstr "Вжити той самий IP для ігрових підсерверів"
+
+#. TRANSLATORS: servers dialog label
+#: src/gui/windows/serverdialog.cpp:409
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr "Завантажую список серверів... %2.2f%%"
+
+#. TRANSLATORS: servers dialog label
+#: src/gui/windows/serverdialog.cpp:415
+msgid "Waiting for server..."
+msgstr "Очікування відповіді сервера..."
+
+#. TRANSLATORS: servers dialog label
+#: src/gui/windows/serverdialog.cpp:420
+msgid "Preparing download"
+msgstr "Готуюсь до завантаження"
+
+#. TRANSLATORS: servers dialog label
+#: src/gui/windows/serverdialog.cpp:425
+msgid "Error retreiving server list!"
+msgstr "Помилка при завантаженні списку серверів!"
+
+#. TRANSLATORS: servers dialog label
+#: src/gui/windows/serverdialog.cpp:515
+msgid "requires a newer version"
+msgstr "потребує новішої версії клієнта"
+
+#. TRANSLATORS: servers dialog label
+#: src/gui/windows/serverdialog.cpp:520
+#, c-format
+msgid "requires v%s"
+msgstr "потребує v%s"
+
+#. TRANSLATORS: setup button
+#: src/gui/windows/setupwindow.cpp:93
+msgid "Apply"
+msgstr "Застосувати"
+
+#. TRANSLATORS: setup button
+#: src/gui/windows/setupwindow.cpp:99
+msgid "Reset Windows"
+msgstr "Скинути налаштування вікон"
+
+#. TRANSLATORS: shop window name
+#: src/gui/windows/shopwindow.cpp:79
+msgid "Personal Shop"
+msgstr "Особиста крамниця"
+
+#. TRANSLATORS: shop window label
+#: src/gui/windows/shopwindow.cpp:94
+msgid "Buy items"
+msgstr "Купувати"
+
+#. TRANSLATORS: shop window label
+#: src/gui/windows/shopwindow.cpp:96
+msgid "Sell items"
+msgstr "Продавати"
+
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
+msgid "Announce"
+msgstr "Анонс"
+
+#. TRANSLATORS: shop window checkbox
+#: src/gui/windows/shopwindow.cpp:113
+msgid "Show links in announce"
+msgstr "Посилання у анонсі"
+
+#. TRANSLATORS: shop window dialog
+#. TRANSLATORS: trade message
+#: src/gui/windows/shopwindow.cpp:782 src/net/ea/tradehandler.cpp:173
+msgid "Request for Trade"
+msgstr "Запит на торгівлю"
+
+#: src/gui/windows/shopwindow.cpp:782
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr "%s бажає %s %s, підтримуєте пропозицію?"
+
+#. TRANSLATORS: skills dialog button
+#: src/gui/windows/skilldialog.cpp:83
+msgid "Up"
+msgstr "Вище"
+
+#. TRANSLATORS: skills dialog label
+#: src/gui/windows/skilldialog.cpp:193
+#, c-format
+msgid "Skill points available: %d"
+msgstr "Балів вмінь: %d"
+
+#. TRANSLATORS: skills dialog default skill tab
+#: src/gui/windows/skilldialog.cpp:291
+#, c-format
+msgid "Skill Set %d"
+msgstr "Група вмінь %d"
+
+#. TRANSLATORS: skills dialog. skill id
+#: src/gui/windows/skilldialog.cpp:312
+#, c-format
+msgid "Skill %d"
+msgstr "Вміння %d"
+
+#: src/gui/windows/skilldialog.cpp:457
+#, c-format
+msgid "Failed skill: %s"
+msgstr "Невдале вміння: %s"
+
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/windows/socialwindow.cpp:76
+msgid "P"
+msgstr "Г"
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/windows/socialwindow.cpp:81
+msgid "F"
+msgstr "П"
+
+#. TRANSLATORS: social window button
+#: src/gui/windows/socialwindow.cpp:87
+msgid "Invite"
+msgstr "Запросити"
+
+#. TRANSLATORS: chat message
+#: src/gui/windows/socialwindow.cpp:276
+#, c-format
+msgid "Accepted party invite from %s."
+msgstr "Прийнято запрошення в групу від %s."
+
+#. TRANSLATORS: chat message
+#: src/gui/windows/socialwindow.cpp:287
+#, c-format
+msgid "Rejected party invite from %s."
+msgstr "Відхилено запрошення в групу від %s."
+
+#. TRANSLATORS: chat message
+#: src/gui/windows/socialwindow.cpp:304
+#, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Прийнято запрошення в гільдію від %s."
+
+#. TRANSLATORS: chat message
+#: src/gui/windows/socialwindow.cpp:318
+#, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Відхилено запрошення в гільдію від %s."
+
+#. TRANSLATORS: chat message
+#: src/gui/windows/socialwindow.cpp:358
+#, c-format
+msgid "Creating guild called %s."
+msgstr "Створено гільдію %s."
+
+#. TRANSLATORS: chat message
+#: src/gui/windows/socialwindow.cpp:379
+#, c-format
+msgid "Creating party called %s."
+msgstr "Створено група %s."
+
+#. TRANSLATORS: guild creation message
+#: src/gui/windows/socialwindow.cpp:394
+msgid "Guild Name"
+msgstr "Назва гільдії"
+
+#. TRANSLATORS: guild creation message
+#: src/gui/windows/socialwindow.cpp:396
+msgid "Choose your guild's name."
+msgstr "Оберіть назву гільдії."
+
+#. TRANSLATORS: chat message
+#: src/gui/windows/socialwindow.cpp:412
+msgid "Received guild request, but one already exists."
+msgstr "Отримано запрошення до гільдії, але одне вже є."
+
+#. TRANSLATORS: chat message
+#: src/gui/windows/socialwindow.cpp:420
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s запрошує вас до гільдії %s."
+
+#. TRANSLATORS: guild invite message
+#: src/gui/windows/socialwindow.cpp:427
+msgid "Accept Guild Invite"
+msgstr "Прийняти запрошення до гільдії"
+
+#. TRANSLATORS: chat message
+#: src/gui/windows/socialwindow.cpp:444
+msgid "Received party request, but one already exists."
+msgstr "Отримано запрошення до групи, але одне вже є."
+
+#. TRANSLATORS: party invite message
+#: 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:461
+#, c-format
+msgid "You have been invited to join the %s party."
+msgstr "Вас запросили до групи %s."
+
+#. TRANSLATORS: party invite message
+#: src/gui/windows/socialwindow.cpp:470
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s запрошує вас приєднатись до їх групи."
+
+#. TRANSLATORS: party invite message
+#: src/gui/windows/socialwindow.cpp:476
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s запрошує вас до групи %s."
+
+#. TRANSLATORS: party invite message
+#: src/gui/windows/socialwindow.cpp:486
+msgid "Accept Party Invite"
+msgstr "Запрошення до групи прийнято"
+
+#: 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:512
+msgid "Party Name"
+msgstr "Група"
+
+#. TRANSLATORS: party creation message
+#: src/gui/windows/socialwindow.cpp:514
+msgid "Choose your party's name."
+msgstr "Оберіть назву групи."
+
+#. TRANSLATORS: status window label
+#: src/gui/windows/statuswindow.cpp:76
+msgid "HP:"
+msgstr "Здоров'я:"
+
+#. TRANSLATORS: status window label
+#: src/gui/windows/statuswindow.cpp:79
+msgid "Exp:"
+msgstr "Досвід:"
+
+#. TRANSLATORS: status window label
+#: src/gui/windows/statuswindow.cpp:137
+msgid "MP:"
+msgstr "Мана:"
+
+#. TRANSLATORS: status window label
+#: src/gui/windows/statuswindow.cpp:180 src/gui/windows/statuswindow.cpp:303
+#, c-format
+msgid "Job: %d"
+msgstr "Робота: %d"
+
+#. TRANSLATORS: status window label
+#: src/gui/windows/statuswindow.cpp:182
+msgid "Job:"
+msgstr "Робота:"
+
+#. TRANSLATORS: status window label
+#: src/gui/windows/statuswindow.cpp:238 src/gui/windows/statuswindow.cpp:349
+#, c-format
+msgid "Character points: %d"
+msgstr "Нерозподілених балів: %d"
+
+#. TRANSLATORS: status window label
+#: src/gui/windows/statuswindow.cpp:364
+#, c-format
+msgid "Correction points: %d"
+msgstr "Балів вмінь: %d"
+
+#. TRANSLATORS: command editor name
+#: src/gui/windows/textcommandeditor.cpp:48
+msgid "Command Editor"
+msgstr "Редактор команд"
+
+#. TRANSLATORS: command editor button
+#: src/gui/windows/textcommandeditor.cpp:53
+msgid "magic"
+msgstr "магія"
+
+#. TRANSLATORS: command editor button
+#: src/gui/windows/textcommandeditor.cpp:55
+msgid "other"
+msgstr "інше"
+
+#. TRANSLATORS: command editor label
+#: src/gui/windows/textcommandeditor.cpp:57
+msgid "Symbol:"
+msgstr "Символ:"
+
+#. TRANSLATORS: command editor label
+#: src/gui/windows/textcommandeditor.cpp:60
+msgid "Command:"
+msgstr "Команда:"
+
+#. TRANSLATORS: command editor label
+#: src/gui/windows/textcommandeditor.cpp:63
+msgid "Comment:"
+msgstr "Примітка:"
+
+#. TRANSLATORS: command editor label
+#: src/gui/windows/textcommandeditor.cpp:67
+msgid "Target Type:"
+msgstr "Тип цілі:"
+
+#. TRANSLATORS: command editor label
+#: src/gui/windows/textcommandeditor.cpp:71
+msgid "Icon:"
+msgstr "Значок:"
+
+#. TRANSLATORS: command editor label
+#: src/gui/windows/textcommandeditor.cpp:74
+msgid "Mana:"
+msgstr "Мана:"
+
+#. TRANSLATORS: command editor label
+#: src/gui/windows/textcommandeditor.cpp:77
+msgid "Magic level:"
+msgstr "Рівень мани:"
+
+#. TRANSLATORS: command editor label
+#: src/gui/windows/textcommandeditor.cpp:81
+msgid "Magic School:"
+msgstr "Школа магії:"
+
+#. TRANSLATORS: command editor label
+#: src/gui/windows/textcommandeditor.cpp:84
+msgid "School level:"
+msgstr "Рівень школи:"
+
+#. TRANSLATORS: command editor button
+#: src/gui/windows/textcommandeditor.cpp:89
+msgid "Save"
+msgstr "Зберегти"
+
+#. TRANSLATORS: trade window button
+#: src/gui/windows/tradewindow.cpp:63
+msgid "Propose trade"
+msgstr "Запропонувати торгівлю"
+
+#. TRANSLATORS: trade window button
+#: src/gui/windows/tradewindow.cpp:65
+msgid "Confirmed. Waiting..."
+msgstr "Прийнято. Чекаємо..."
+
+#. TRANSLATORS: trade window button
+#: src/gui/windows/tradewindow.cpp:67
+msgid "Agree trade"
+msgstr "Згодитися торгувати"
+
+#. TRANSLATORS: trade window button
+#: src/gui/windows/tradewindow.cpp:69
+msgid "Agreed. Waiting..."
+msgstr "Згода. Чекаємо..."
+
+#. TRANSLATORS: trade window caption
+#: src/gui/windows/tradewindow.cpp:73
+msgid "Trade: You"
+msgstr "Торгівля: ти"
+
+#. TRANSLATORS: trade window money label
+#: src/gui/windows/tradewindow.cpp:81 src/gui/windows/tradewindow.cpp:188
+#, c-format
+msgid "You get %s"
+msgstr "Ти отримуєш: %s."
+
+#. TRANSLATORS: trade window money change button
+#: src/gui/windows/tradewindow.cpp:86
+msgid "Change"
+msgstr "Заміна"
+
+#. TRANSLATORS: trade window money label
+#: src/gui/windows/tradewindow.cpp:131
+msgid "You give:"
+msgstr "Ти віддаєш:"
+
+#. TRANSLATORS: trade error
+#: src/gui/windows/tradewindow.cpp:409
+msgid "You don't have enough money."
+msgstr "У тебе недостатньо коштів!"
+
+#. TRANSLATORS: trade error
+#: src/gui/windows/tradewindow.cpp:495
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Не вдається додати предмет. Не можна накладати предмети одного типу."
+
+#. TRANSLATORS: unregister dialog. label.
+#: src/gui/windows/unregisterdialog.cpp:65
+#, c-format
+msgid "Name: %s"
+msgstr "Ім'я: %s"
+
+#. TRANSLATORS: updater window name
+#: src/gui/windows/updaterwindow.cpp:172
+msgid "Updating..."
+msgstr "Оновлення..."
+
+#. TRANSLATORS: updater window label
+#: src/gui/windows/updaterwindow.cpp:189
+msgid "Connecting..."
+msgstr "З'єднуюсь..."
+
+#: src/gui/windows/updaterwindow.cpp:406
+msgid "Show all news (can be slow)"
+msgstr "Показати всі новини (може бути повільним)"
+
+#. TRANSLATORS: update message
+#: src/gui/windows/updaterwindow.cpp:832
+msgid "##1  The update process is incomplete."
+msgstr "##1  Процес поновлення не завершився!"
+
+#. TRANSLATORS: Continues "The update process is incomplete.".
+#: src/gui/windows/updaterwindow.cpp:834
+msgid "##1  It is strongly recommended that"
+msgstr "##1  Настійно рекомендовано"
+
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/windows/updaterwindow.cpp:836
+msgid "##1  you try again later."
+msgstr "##1  спробувати ще раз пізніше."
+
+#. TRANSLATORS: updater window label
+#: src/gui/windows/updaterwindow.cpp:1020
+msgid "Completed"
+msgstr "Завершено"
+
+#. TRANSLATORS: who is online window name
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:633
+msgid "Who Is Online - Updating"
+msgstr "Хто онлайн - оновлюється"
+
+#. TRANSLATORS: who is online. button.
+#: src/gui/windows/whoisonline.cpp:102
+msgid "Update"
+msgstr "Оновити"
+
+#. TRANSLATORS: who is online window name
+#: src/gui/windows/whoisonline.cpp:228
+msgid "Who Is Online - "
+msgstr "Хто онлайн - "
+
+#. TRANSLATORS: who is online window name
+#: src/gui/windows/whoisonline.cpp:648
+msgid "Who Is Online - error"
+msgstr "Хто онлайн - помилка"
+
+#. TRANSLATORS: who is online window name
+#: src/gui/windows/whoisonline.cpp:690
+msgid "Who Is Online - Update"
+msgstr "Хто онлайн - оновити"
+
+#. TRANSLATORS: world select dialog name
+#: src/gui/windows/worldselectdialog.cpp:48
+msgid "Select World"
+msgstr "Вибрати світ"
+
+#. TRANSLATORS: world dialog button
+#: src/gui/windows/worldselectdialog.cpp:54
+msgid "Change Login"
+msgstr "Заміна"
+
+#. TRANSLATORS: world dialog button
+#: src/gui/windows/worldselectdialog.cpp:56
+msgid "Choose World"
+msgstr "Оберіть світ"
+
+#. TRANSLATORS: long key name. must be short.
+#. TRANSLATORS: short key name. must be very short.
+#. TRANSLATORS: long key name, should be short
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
+#: src/input/keyboardconfig.cpp:104
+#, c-format
+msgid "key_%d"
+msgstr "клавіша_%d"
+
+#. TRANSLATORS: long joystick button name. must be short.
+#: src/input/inputmanager.cpp:377
+#, c-format
+msgid "JButton%d"
+msgstr "КлавішаДж%d"
+
+#. TRANSLATORS: unknown long key type
+#: src/input/inputmanager.cpp:391
+msgid "unknown key"
+msgstr "невідома клавіша"
+
+#. TRANSLATORS: short joystick button name. muse be very short
+#: src/input/inputmanager.cpp:421
+#, c-format
+msgid "JB%d"
+msgstr "ДЖ%d"
+
+#. TRANSLATORS: unknown short key type. must be short
+#. TRANSLATORS: Unknown key short string.
+#. TRANSLATORS: This string must be maximum 5 chars
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
+msgid "u key"
+msgstr "невід."
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:36
+msgid "Target and attack keys"
+msgstr "Клавіші мішені та атаки"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:48
+msgid "Target & attack closest monster"
+msgstr "Вибрати та атакувати найближчого моба"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:54
+msgid "Target & attack closest player"
+msgstr "Вибрати та атакувати найближчого гравця"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:60
+msgid "Move to Target"
+msgstr "Рухатись до цілі"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:66
+msgid "Change Move to Target type"
+msgstr "Змінити тип руху до цілі"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:72
+msgid "Move to Home location"
+msgstr "Подорожувати додому"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:78
+msgid "Set home location"
+msgstr "Вказати домашню локацію"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:84
+msgid "Move to navigation point"
+msgstr "Рухатись до навігаційної точки"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:96
+msgid "Stop Attack / Modifier key"
+msgstr "Зупинити атаку / Клавіша модифікатора"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:102
+msgid "Untarget"
+msgstr "Скинути ціль"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:108
+msgid "Target monster"
+msgstr "Вибрати моба"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:114
+msgid "Target closest monster (without filters)"
+msgstr "Вибрати найближчого моба (без фільтру атаки)"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:120
+msgid "Target NPC"
+msgstr "Вибрати NPC"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:126
+msgid "Target Player"
+msgstr "Вибрати гравця"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:132
+msgid "Target mercenary"
+msgstr "Вибрати крамаря"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:138
+msgid "Target pet"
+msgstr "Вибрати улюбленця"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:144
+msgid "Catch pet"
+msgstr "Зловити улюбленця"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:150
+msgid "Other Keys"
+msgstr "Інші клавіші"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:156
+msgid "Pickup"
+msgstr "Підняти"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:162
+msgid "Change Pickup Type"
+msgstr "Змінити тип підбирання"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:168
+msgid "Sit"
+msgstr "Присісти"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:174
+msgid "Screenshot"
+msgstr "Скріншот"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:180
+msgid "Enable/Disable Trading"
+msgstr "Ввімкнути/вимкнути торгівлю"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:186
+msgid "Open trade window"
+msgstr "Відкрити вікно торгівлі"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:192
+msgid "Start trade with target"
+msgstr "Торгувати з ціллю"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:198
+msgid "Follow selected player"
+msgstr "Йти слідом за вибраним гравцем"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:204
+msgid "Change Map View Mode"
+msgstr "Змінити режим мапи"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:210
+msgid "Select OK"
+msgstr "Вибрати ОК"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:222
+msgid "Stop or sit"
+msgstr "Зупинитись або присісти"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:228
+msgid "Return to safe video mode"
+msgstr "Повернутись до безпечного відеорежиму"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:234
+msgid "Fire your homunculus"
+msgstr "Звільнити гомункула"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:252
+msgid "Open context menu"
+msgstr "Відкрити контекстне меню"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:33
+msgid "Toggle Chat"
+msgstr "Перемикнути балачку"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:39
+msgid "Scroll Chat Up"
+msgstr "Гортати балачку вище"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:45
+msgid "Scroll Chat Down"
+msgstr "Гортати балачку нижче"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:51
+msgid "Previous Chat Tab"
+msgstr "Попередня балачка"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:57
+msgid "Next Chat Tab"
+msgstr "Наступна балачка"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:63
+msgid "Clear current chat tab"
+msgstr "Очистити активну балачку"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:69
+msgid "Close current Chat Tab"
+msgstr "Закрити активну балачку"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:75
+msgid "Close all chat tabs"
+msgstr "Закрити всі вкладки балачок"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:81
+msgid "Ignore all whispers"
+msgstr "Ігнорувати всі приватні повідомлення"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:87
+msgid "Ignore all whispers on server side"
+msgstr "Ігнорувати всі приватні"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:93
+msgid "Unignore all whispers on server side"
+msgstr "Вимкнути ігнорування всіх приватних повідомлень на сервері"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:99
+msgid "Previous chat line"
+msgstr "Попередня вкладка балачки"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:105
+msgid "Next chat line"
+msgstr "Наступна вкладка балачки"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:111
+msgid "Chat modifier key"
+msgstr "Модифікатор балачки"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/chat.cpp:117
+msgid "Show smiles"
+msgstr "Показувати смайлики (режим балачки)"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:37
+msgid "Emote modifiers keys"
+msgstr "Клавіші модифікаторів смайликів"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:43
+msgid "Emote modifier key"
+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: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 "Клавіша смайлику улюбленця %d"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:33
+msgid "Move & selection"
+msgstr "Рух і вибір"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:39
+msgid "Move Up"
+msgstr "Вище"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:45
+msgid "Move Down"
+msgstr "Нижче"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:51
+msgid "Move Left"
+msgstr "Ліворуч"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:57
+msgid "Move Right"
+msgstr "Праворуч"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:63
+msgid "Move Home"
+msgstr "Початок"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:69
+msgid "Move End"
+msgstr "Кінець"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:75
+msgid "Page up"
+msgstr "Сторінка вище"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:81
+msgid "Page down"
+msgstr "Сторінка нижче"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:99
+msgid "Select2"
+msgstr "Вибір2"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:117
+msgid "Backspace"
+msgstr "Видалити лівіше"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:123
+msgid "Insert"
+msgstr "Вставити"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:129
+msgid "Tab"
+msgstr "Табуляція"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:135
+msgid "Mod"
+msgstr "Модифікатор"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/gui.cpp:141
+msgid "Ctrl"
+msgstr "Ctrl"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/move.cpp:37
+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 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: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
+#: src/input/pages/move.cpp:139 src/input/pages/move.cpp:145
+#: src/input/pages/move.cpp:151 src/input/pages/move.cpp:157
+#: src/input/pages/move.cpp:163 src/input/pages/move.cpp:169
+#: src/input/pages/move.cpp:175 src/input/pages/move.cpp:181
+#: src/input/pages/move.cpp:187 src/input/pages/move.cpp:193
+#: src/input/pages/move.cpp:199 src/input/pages/move.cpp:205
+#: src/input/pages/move.cpp:211 src/input/pages/move.cpp:217
+#: src/input/pages/move.cpp:223 src/input/pages/move.cpp:229
+#: src/input/pages/move.cpp:235 src/input/pages/move.cpp:241
+#: src/input/pages/move.cpp:247 src/input/pages/move.cpp:253
+#: src/input/pages/move.cpp:259 src/input/pages/move.cpp:265
+#: src/input/pages/move.cpp:271 src/input/pages/move.cpp:277
+#: src/input/pages/move.cpp:283 src/input/pages/move.cpp:289
+#: src/input/pages/move.cpp:295 src/input/pages/move.cpp:301
+#: src/input/pages/move.cpp:307 src/input/pages/move.cpp:313
+#: src/input/pages/move.cpp:319 src/input/pages/move.cpp:325
+#: 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 "Перейти в точку %d"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:36
+msgid "Input ignore"
+msgstr "Ігнорувати введення"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:42
+msgid "Ignore input 1"
+msgstr "Ігнорувати пристрій вводу 1"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:48
+msgid "Ignore input 2"
+msgstr "Ігнорувати пристрій вводу 2"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:54
+msgid "Direction keys"
+msgstr "Клавіші напрямку"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:60
+msgid "Player direct up"
+msgstr "Гравець спрямований угору"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:66
+msgid "Player direct down"
+msgstr "Гравець спрямований донизу"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:72
+msgid "Player direct left"
+msgstr "Гравець спрямований ліворуч"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:78
+msgid "Player direct right"
+msgstr "Гравець спрямований праворуч"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:84
+msgid "Pet direct up"
+msgstr "Улюбленець спрямований угору"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:90
+msgid "Pet direct down"
+msgstr "Улюбленець спрямований донизу"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:96
+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 "Швидке кидання N предметів з 0 комірця"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:132
+msgid "Quick Drop N Items"
+msgstr "Швидке скидання N предметів"
+
+#. 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:150
+msgid "Use #itenplz spell"
+msgstr "Чаклувати #itenplz"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:156
+msgid "Use magic attack"
+msgstr "Застосувати магічну атаку"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:162
+msgid "Switch magic attack"
+msgstr "Перемикач магічної атаки"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:168
+msgid "Switch pvp attack"
+msgstr "Перемикач режиму PVP атаки"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:174
+msgid "Change move type"
+msgstr "Змінити режиму руху"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:180
+msgid "Change Attack Weapon Type"
+msgstr "Змінити тип зброї"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:186
+msgid "Change Attack Type"
+msgstr "Змінити тип атаки"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:192
+msgid "Change Follow mode"
+msgstr "Змінити режим слідкування"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:198
+msgid "Change Imitation mode"
+msgstr "Змінити режим імітації"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:204
+msgid "Disable / Enable Game modifier keys"
+msgstr "Активує / Деактивує клавіші Жовтого рядка"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:210
+msgid "On / Off audio"
+msgstr "Ввімкнути / Вимкнути звук"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:216
+msgid "Enable / Disable away mode"
+msgstr "Ввімкнути / вимкнути режим відсутності"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:222
+msgid "Emulate right click from keyboard"
+msgstr "Емуляція правого кліку з клавіатури"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:228
+msgid "Toggle camera mode"
+msgstr "Перемкнути режим камери"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:234
+msgid "Toggle ipc mode"
+msgstr "Перемкнути IPC режим"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:240
+msgid "Show information about position in chat"
+msgstr "Надати позицію гравця в чаті"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:246
+msgid "Show online players number in chat"
+msgstr "Надати кількість онлайн гравців у чаті"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:252
+msgid "Show onscreen keyboard"
+msgstr "Показати екранну клавіатуру"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:258
+msgid "Clean cached graphics"
+msgstr "Скинути графічний кеш"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:264
+msgid "Clean cached fonts"
+msgstr "Скинути шрифтовий кеш"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:270
+msgid "Print visible players in chat"
+msgstr "Надати імена видимих гравців у чаті"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:276
+msgid "Print all visible beings in chat"
+msgstr "Вивести всі видимі істоти в чаті"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:282
+msgid "Load shop items list from disk"
+msgstr "Поновити прейскурант крамниці з файлу на диску"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:288
+msgid "Save shop items list to disk"
+msgstr "Зберегти ціни крамниці"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:294
+msgid "Print debug cache info"
+msgstr "Вивести дані зневадження кешу"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:300
+msgid "Undress selected player"
+msgstr "Роздягти вибраного гравця"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:306
+msgid "Quick disconnect from server"
+msgstr "Швидке від'єднання"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:312
+msgid "Disable debug particle"
+msgstr "Вимкнути частинки зневадження"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:318
+msgid "Create items (for gms)"
+msgstr "Створити предмети (ГМ)"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:324
+msgid "Print configured directories in chat"
+msgstr "Надати робочі шляхи до чату"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:330
+msgid "Print client uptime in chat"
+msgstr "Показати час роботи клієнта"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:336
+msgid "Dump debug information"
+msgstr "Вивести дані зневадження"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:342
+msgid "Crash client"
+msgstr "Аварійно завершити клієнт"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:348
+msgid "Dump graphics info into chat"
+msgstr "Вивести налаштування графіки"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:354
+msgid "Dump tests info into chat"
+msgstr "Вивести інформацію про тести в чат"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:360
+msgid "Print OpenGL version in chat"
+msgstr "Вивести версію OpenGL"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:366
+msgid "Print enabled mods in chat"
+msgstr "Вивести активовані моди в чат"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:372
+msgid "Dump environments into log"
+msgstr "Розвантажити змінні середовища в лог"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:378
+msgid "Dump OpenGL state into log"
+msgstr "Розвантажити стан OpenGL в лог"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:385
+msgid "Test SDL font speed"
+msgstr "Тест швидкості шрифту SDL"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:392
+msgid "Upload main config"
+msgstr "Завантажити файл основної конфігурації"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:398
+msgid "Upload server config"
+msgstr "Завантажити серверну конфігурацію"
+
+#. TRANSLATORS: input action name
+#: 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 "Ввімкнути AI улюбленця"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/other.cpp:422
+msgid "Pet ai stop"
+msgstr "Вимкнути AI улюбленця"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/outfits.cpp:37
+msgid "Outfits keys"
+msgstr "Клавіші швидкого спорядження"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/outfits.cpp:43
+msgid "Wear Outfit"
+msgstr "Вдягти швидке спорядження"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/outfits.cpp:49
+msgid "Copy Outfit"
+msgstr "Копіювати швидке спорядження"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/outfits.cpp:55
+msgid "Copy equipped to Outfit"
+msgstr "Копіювати вдягнене до швидкого спорядження"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/outfits.cpp:61
+msgid "Outfits shortcuts"
+msgstr "Клавіші швидкого спорядження"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/outfits.cpp:67 src/input/pages/outfits.cpp:73
+#: src/input/pages/outfits.cpp:79 src/input/pages/outfits.cpp:85
+#: src/input/pages/outfits.cpp:91 src/input/pages/outfits.cpp:97
+#: src/input/pages/outfits.cpp:103 src/input/pages/outfits.cpp:109
+#: src/input/pages/outfits.cpp:115 src/input/pages/outfits.cpp:121
+#: src/input/pages/outfits.cpp:127 src/input/pages/outfits.cpp:133
+#: src/input/pages/outfits.cpp:139 src/input/pages/outfits.cpp:145
+#: src/input/pages/outfits.cpp:151 src/input/pages/outfits.cpp:157
+#: src/input/pages/outfits.cpp:163 src/input/pages/outfits.cpp:169
+#: src/input/pages/outfits.cpp:175 src/input/pages/outfits.cpp:181
+#: src/input/pages/outfits.cpp:187 src/input/pages/outfits.cpp:193
+#: src/input/pages/outfits.cpp:199 src/input/pages/outfits.cpp:205
+#: src/input/pages/outfits.cpp:211 src/input/pages/outfits.cpp:217
+#: src/input/pages/outfits.cpp:223 src/input/pages/outfits.cpp:229
+#: src/input/pages/outfits.cpp:235 src/input/pages/outfits.cpp:241
+#: src/input/pages/outfits.cpp:247 src/input/pages/outfits.cpp:253
+#: src/input/pages/outfits.cpp:259 src/input/pages/outfits.cpp:265
+#: src/input/pages/outfits.cpp:271 src/input/pages/outfits.cpp:277
+#: src/input/pages/outfits.cpp:283 src/input/pages/outfits.cpp:289
+#: src/input/pages/outfits.cpp:295 src/input/pages/outfits.cpp:301
+#: src/input/pages/outfits.cpp:307 src/input/pages/outfits.cpp:313
+#: src/input/pages/outfits.cpp:319 src/input/pages/outfits.cpp:325
+#: src/input/pages/outfits.cpp:331 src/input/pages/outfits.cpp:337
+#: src/input/pages/outfits.cpp:343 src/input/pages/outfits.cpp:349
+#, c-format
+msgid "Outfit Shortcut %d"
+msgstr "Клавіша спорядження %d"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/shortcuts.cpp:37
+msgid "Shortcuts modifiers keys"
+msgstr "Модифікатори швидких клавіш"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/shortcuts.cpp:43
+msgid "Item Shortcuts Key"
+msgstr "Клавіша швидких предметів"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/shortcuts.cpp:49
+msgid "Shortcuts keys"
+msgstr "Швидкі клавіші"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/shortcuts.cpp:55 src/input/pages/shortcuts.cpp:61
+#: src/input/pages/shortcuts.cpp:67 src/input/pages/shortcuts.cpp:73
+#: src/input/pages/shortcuts.cpp:79 src/input/pages/shortcuts.cpp:85
+#: src/input/pages/shortcuts.cpp:91 src/input/pages/shortcuts.cpp:97
+#: src/input/pages/shortcuts.cpp:103 src/input/pages/shortcuts.cpp:109
+#: src/input/pages/shortcuts.cpp:115 src/input/pages/shortcuts.cpp:121
+#: src/input/pages/shortcuts.cpp:127 src/input/pages/shortcuts.cpp:133
+#: src/input/pages/shortcuts.cpp:139 src/input/pages/shortcuts.cpp:145
+#: src/input/pages/shortcuts.cpp:151 src/input/pages/shortcuts.cpp:157
+#: src/input/pages/shortcuts.cpp:163 src/input/pages/shortcuts.cpp:169
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Клавіша швидкого предмета %d"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:36
+msgid "Show Windows Menu"
+msgstr "Показати меню вікон"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:42
+msgid "Hide Windows"
+msgstr "Сховати вікна"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:48
+msgid "About Window"
+msgstr "Про вікно"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:54
+msgid "Bank Window"
+msgstr "Вікно банку"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:60
+msgid "Help Window"
+msgstr "Вікно довідки"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:66
+msgid "Status Window"
+msgstr "Вікно стану"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:72
+msgid "Inventory Window"
+msgstr "Сумка"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:78
+msgid "Equipment Window"
+msgstr "Вікно спорядження"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:84
+msgid "Skill Window"
+msgstr "Вікно вмінь"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:90
+msgid "Minimap Window"
+msgstr "Мінімапа"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:96
+msgid "Chat Window"
+msgstr "Вікно балачок"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:102
+msgid "Item Shortcut Window"
+msgstr "Вікно швидких предметів"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:108
+msgid "Setup Window"
+msgstr "Вікно налаштування"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:114
+msgid "Debug Window"
+msgstr "Вікно зневадження"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:120
+msgid "Social Window"
+msgstr "Вікно спільноти"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:126
+msgid "Emote Shortcut Window"
+msgstr "Вікно смайликів"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:132
+msgid "Outfits Window"
+msgstr "Вікно швидкого спорядження"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:138
+msgid "Shop Window"
+msgstr "Вікно крамниці"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:144
+msgid "Quick drop Window"
+msgstr "Вікно швидких дропів"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:150
+msgid "Kill Stats Window"
+msgstr "Вікно статистики атак"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:156
+msgid "Commands Window"
+msgstr "Вікно команд"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:162
+msgid "Bot Checker Window"
+msgstr "Вікно перевірки ботів"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:168
+msgid "Who Is Online Window"
+msgstr "Вікно \"Хто онлайн\""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:174
+msgid "Did you know Window"
+msgstr "Вікно \"Чи вам відомо\""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:180
+msgid "Quests Window"
+msgstr "Вікно квестів"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:186
+msgid "Updates Window"
+msgstr "Вікно оновлення"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:192
+msgid "Previous Social Tab"
+msgstr "Попередня вкладка вікна спільноти"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:198
+msgid "Next Social Tab"
+msgstr "Наступна вкладка вікна спільноти"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:204
+msgid "Previous Shortcuts tab"
+msgstr "Попередня вкладка швидких предметів"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:210
+msgid "Next Shortcuts tab"
+msgstr "Наступна вкладка швидких предметів"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:216
+msgid "Previous Commands tab"
+msgstr "Попередня вкладка вікна команд"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:222
+msgid "Next Commands tab"
+msgstr "Наступна вкладка вікна команд"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:228
+msgid "Previous inventory tab"
+msgstr "Попередня вкладка сумки"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:234
+msgid "Next inventory tab"
+msgstr "Наступна вкладка сумки"
+
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:304
+msgid "Storage"
+msgstr "Сховище"
+
+#. TRANSLATORS: inventory type name
+#: src/inventory.cpp:309
+msgid "Cart"
+msgstr "Візок"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:79
+msgid "manaplus [options] [manaplus-file]"
+msgstr "manaplus [опції] [manaplus-файл]"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:81
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr "[manaplus-файл] : Файл manaplus це XML файл (.manaplus)"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:84
+msgid "                  used to set custom parameters"
+msgstr "                  використовується для додаткових параметрів"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:86
+msgid "                  to the manaplus client."
+msgstr "                  до manaplus клієнту."
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:89
+msgid "Options:"
+msgstr "Параметри:"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:91
+msgid "  -l --log-file       : Log file to use"
+msgstr "  - --log-file        : Лог-файл"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:93
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr "  -a --chat-log-dir   : Тека логу чату"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:95
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Показати версію"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:97
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Показати ще раз цю довідку"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:99
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file    : Файл, з якого необхідно завантажити налаштування"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:102
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Зареєструватися на сервері зі вказаним логіном"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:104
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Зареєструватися на сервері зі вказаним паролем"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:106
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Обрати в акаунті зазначеного персонажа"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:108
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Ім'я серверу або IP"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:110
+msgid "  -y --server-type    : Login server type"
+msgstr "  -y --server-type    : Тип логін-серверу"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:112
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Порт логіну"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:114
+msgid "  -H --update-host    : Use this update host"
+msgstr "  -H --update-host    : Сервер, з якого необхідно завантажити оновлення"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:116
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Обрати сервер та персонаж за замовчуванням"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:119
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Пропустити завантаження оновлення"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:121
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Тека з користувацькими ігровими ресурсами"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:124
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Тека з локальними даними"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:127
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Тека скріншотів"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:130
+msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : Ввімкнути гру в безпечному режимі"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:132
+msgid "     --renderer       : Set renderer type"
+msgstr "     --renderer       : Ввімкнути тип рендерингу"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:134
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr "  -T --tests          : Стартувати тести та автоконфігурацію"
+
+#. TRANSLATORS: command line help
+#: src/main.cpp:138
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl      : Вимкнути OpenGL під час цієї сесії"
+
+#. TRANSLATORS: error message
+#: src/net/ea/charserverhandler.cpp:87
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "Доступ заборонений. Скоріше за все, зараз не ньому забагато гравців."
+
+#. TRANSLATORS: error message
+#: src/net/ea/charserverhandler.cpp:92
+msgid "Cannot use this ID."
+msgstr "Неможливо вжити цей ID."
+
+#. TRANSLATORS: error message
+#: src/net/ea/charserverhandler.cpp:96
+msgid "Unknown char-server failure."
+msgstr "Невідома помилка серверу персонажів."
+
+#. TRANSLATORS: error message
+#: src/net/ea/charserverhandler.cpp:112
+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:247
+#: src/net/eathena/loginhandler.cpp:218
+msgid "Wrong name."
+msgstr "Некоректне ім'я."
+
+#. TRANSLATORS: error message
+#: src/net/ea/charserverhandler.cpp:121
+msgid "Incorrect stats."
+msgstr "Невірні характеристики."
+
+#. TRANSLATORS: error message
+#: src/net/ea/charserverhandler.cpp:125
+msgid "Incorrect hair."
+msgstr "Невірна зачіска."
+
+#. TRANSLATORS: error message
+#: src/net/ea/charserverhandler.cpp:129
+msgid "Incorrect slot."
+msgstr "Невірний слот."
+
+#. TRANSLATORS: error message
+#: src/net/ea/charserverhandler.cpp:133
+msgid "Incorrect race."
+msgstr "Невірна раса."
+
+#. TRANSLATORS: error message
+#: src/net/ea/charserverhandler.cpp:137
+msgid "Incorrect look."
+msgstr "Невірний вигляд."
+
+#: src/net/ea/charserverhandler.cpp:160
+msgid "Character deleted."
+msgstr "Персонаж видалено."
+
+#: src/net/ea/charserverhandler.cpp:173
+msgid "Failed to delete character."
+msgstr "Неможливо видалити персонаж."
+
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:130
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Неможливо надіслати приватне повідомлення, %s офлайн!"
+
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:140
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Неможливо надіслати приватне повідомлення, %s встановив ігнорування."
+
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:150
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr "Неможливо надіслати приватне повідомлення, вас ігнорують всі гравці."
+
+#: src/net/ea/gamehandler.cpp:79
+msgid "Game"
+msgstr "Назва"
+
+#. TRANSLATORS: error message
+#: src/net/ea/gamehandler.cpp:81
+msgid "Request to quit denied!"
+msgstr "Позив до виходу відхилено!"
+
+#. TRANSLATORS: guild info message
+#: src/net/ea/guildhandler.cpp:137
+#, c-format
+msgid "Guild name: %s"
+msgstr "Назва гільдії: %s"
+
+#. TRANSLATORS: guild info message
+#: src/net/ea/guildhandler.cpp:140
+#, c-format
+msgid "Guild master: %s"
+msgstr "Володар гільдії: %s"
+
+#. TRANSLATORS: guild info message
+#: src/net/ea/guildhandler.cpp:143
+#, c-format
+msgid "Guild level: %d"
+msgstr "Рівень гільдії: %d"
+
+#. TRANSLATORS: guild info message
+#: src/net/ea/guildhandler.cpp:146
+#, c-format
+msgid "Online members: %d"
+msgstr "Членів онлайн: %d"
+
+#. TRANSLATORS: guild info message
+#: src/net/ea/guildhandler.cpp:149
+#, c-format
+msgid "Max members: %d"
+msgstr "Максимум членів: %d"
+
+#. TRANSLATORS: guild info message
+#: src/net/ea/guildhandler.cpp:152
+#, c-format
+msgid "Average level: %d"
+msgstr "Середній рівень: %d"
+
+#. TRANSLATORS: guild info message
+#: src/net/ea/guildhandler.cpp:155
+#, c-format
+msgid "Guild exp: %d"
+msgstr "Досвід гільдії: %d"
+
+#. TRANSLATORS: guild info message
+#: src/net/ea/guildhandler.cpp:158
+#, c-format
+msgid "Guild next exp: %d"
+msgstr "Досвід до наступного рівня: %d"
+
+#. TRANSLATORS: guild info message
+#: src/net/ea/guildhandler.cpp:161
+#, c-format
+msgid "Guild castle: %s"
+msgstr "Замок гільдії: %s"
+
+#. TRANSLATORS: error message
+#: src/net/ea/loginhandler.cpp:207 src/net/eathena/loginhandler.cpp:173
+msgid "Unregistered ID."
+msgstr "Не зареєстрований ID!"
+
+#. TRANSLATORS: error message
+#: src/net/ea/loginhandler.cpp:211 src/net/eathena/loginhandler.cpp:177
+msgid "Wrong password."
+msgstr "Неправильний пароль!"
+
+#. TRANSLATORS: error message
+#: src/net/ea/loginhandler.cpp:216 src/net/eathena/loginhandler.cpp:182
+msgid "Account expired."
+msgstr "Акаунт прострочено."
+
+#. TRANSLATORS: error message
+#: 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: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:229 src/net/eathena/loginhandler.cpp:195
+msgid "Client too old."
+msgstr "Клієнт застарий."
+
+#. TRANSLATORS: error message
+#: 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"
+"Please contact the GM team via the forums."
+msgstr "Вас було тимчасово забанено до %s.\nЗвертайтесь до команди ГМ'ів на форумі."
+
+#. TRANSLATORS: error message
+#: src/net/ea/loginhandler.cpp:239 src/net/eathena/loginhandler.cpp:208
+msgid "Server overpopulated."
+msgstr "Сервер перенаселено."
+
+#. TRANSLATORS: error message
+#: 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:251 src/net/eathena/loginhandler.cpp:223
+msgid "Incorrect email."
+msgstr "Некоректна електронна пошта!"
+
+#. TRANSLATORS: error message
+#: 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 "Порожня адреса передана до методу Network::connect()!"
+
+#. TRANSLATORS: error message
+#: src/net/ea/network.cpp:209
+msgid "Unable to resolve host \""
+msgstr "Не вдається знайти хост \""
+
+#. TRANSLATORS: error message
+#: src/net/ea/network.cpp:290
+msgid "Connection to server terminated. "
+msgstr "З'єднання з сервером припинене."
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:524
+#: src/net/eathena/charserverhandler.cpp:561
+msgid "Character rename error."
+msgstr "Помилка переіменування персонажу."
+
+#: src/net/eathena/charserverhandler.cpp:539
+msgid "Character renamed."
+msgstr "Персонаж переіменовано."
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:552
+msgid "Rename not allowed."
+msgstr "Переіменування не дозволене."
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:556
+msgid "New name is not set."
+msgstr "Нове ім'я не вжито."
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:565
+msgid "Character not found."
+msgstr "Персонаж не знайдено."
+
+#: src/net/eathena/chathandler.cpp:357
+msgid "Can't cast skill in this area."
+msgstr "Неможливо використати вміння у цій місцевості."
+
+#: src/net/eathena/chathandler.cpp:360
+msgid "Can't use item in this area."
+msgstr "Неможливо використати цей предмет у цій місцевості."
+
+#: src/net/eathena/chathandler.cpp:363
+msgid "Can't equip. Wrong level."
+msgstr "Неможливо вдягнути. Неправильний рівень."
+
+#: src/net/eathena/chathandler.cpp:366
+msgid "Can't use. Wrong level."
+msgstr "Неможливо вжити. Неправильний рівень."
+
+#: src/net/eathena/chathandler.cpp:369
+msgid "Work in progress."
+msgstr "Чекаємо на результат."
+
+#. TRANSLATORS: chat message
+#: src/net/eathena/chathandler.cpp:543
+#, c-format
+msgid "Message could not be sent, channel %s is not exists."
+msgstr "Неможливо відправити повідомлення, канал %s не існує."
+
+#. TRANSLATORS: chat message
+#: src/net/eathena/chathandler.cpp:636
+#, c-format
+msgid "Can't open channel. Channel %s is not exists."
+msgstr "Неможливо відкрити канал, канал %s не існує."
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:128
+#, c-format
+msgid "Strength %s"
+msgstr "Сила %s"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:130
+#, c-format
+msgid "Agility %s"
+msgstr "Спритність %s"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:132
+#, c-format
+msgid "Vitality %s"
+msgstr "Витривалість %s"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:134
+#, c-format
+msgid "Intelligence %s"
+msgstr "Інтелект %s"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:134 src/net/tmwa/generalhandler.cpp:136
+#, c-format
+msgid "Dexterity %s"
+msgstr "Вправність %s"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:135 src/net/tmwa/generalhandler.cpp:138
+#, c-format
+msgid "Luck %s"
+msgstr "Талан %s"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/generalhandler.cpp:170 src/net/tmwa/generalhandler.cpp:173
+msgid "Authentication failed."
+msgstr "Аутентифікація не вдалася."
+
+#. TRANSLATORS: error message
+#: 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: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:183 src/net/tmwa/generalhandler.cpp:189
+msgid "This account is already logged in."
+msgstr "Цей акаунт все знаходиться у грі."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/generalhandler.cpp:187 src/net/tmwa/generalhandler.cpp:194
+msgid "Speed hack detected."
+msgstr "Виявлено перевищення швидкісних лімітів."
+
+#: src/net/eathena/generalhandler.cpp:190
+msgid "Server full."
+msgstr "Сервер повний."
+
+#: src/net/eathena/generalhandler.cpp:193
+msgid "Sorry, you are underaged."
+msgstr "Даруйте, але в вас недостатньо віку!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/generalhandler.cpp:196 src/net/tmwa/generalhandler.cpp:198
+msgid "Duplicated login."
+msgstr "Дубльований логін."
+
+#: src/net/eathena/generalhandler.cpp:199
+msgid "To many connections from same ip."
+msgstr "Забагато з'єднань з того ж самого IP."
+
+#: src/net/eathena/generalhandler.cpp:202
+msgid "Not paid for this time."
+msgstr "Не оплачуване."
+
+#: src/net/eathena/generalhandler.cpp:205
+msgid "Pay suspended."
+msgstr "Оплату призупинено."
+
+#: src/net/eathena/generalhandler.cpp:208
+msgid "Pay changed."
+msgstr "Оплату змінено."
+
+#: src/net/eathena/generalhandler.cpp:211
+msgid "Pay wrong ip."
+msgstr "Оплачувано інший IP."
+
+#: src/net/eathena/generalhandler.cpp:214
+msgid "Pay game room."
+msgstr "Оплатіть кімнату."
+
+#: src/net/eathena/generalhandler.cpp:217
+msgid "Disconnect forced by GM."
+msgstr "ГМ відключив вас від серверу!"
+
+#: src/net/eathena/generalhandler.cpp:221
+msgid "Ban japan refuse."
+msgstr "Японський бан."
+
+#: src/net/eathena/generalhandler.cpp:224
+msgid "Remained other account."
+msgstr "Залишились інші акаунти."
+
+#: src/net/eathena/generalhandler.cpp:227
+msgid "Ip unfair."
+msgstr "Неправильна адреса."
+
+#: src/net/eathena/generalhandler.cpp:230
+msgid "Ip count all."
+msgstr "Перевищення з'єднань з однієї адреси."
+
+#: src/net/eathena/generalhandler.cpp:233
+msgid "Ip count."
+msgstr "Перевищення з'єднань з однієї адреси."
+
+#: src/net/eathena/generalhandler.cpp:237
+msgid "Memory."
+msgstr "Пам'ять."
+
+#: src/net/eathena/generalhandler.cpp:240
+msgid "Han valid."
+msgstr "Коректний HAN."
+
+#: src/net/eathena/generalhandler.cpp:243
+msgid "Ip limited access."
+msgstr "Обмеження IP доступу."
+
+#: src/net/eathena/generalhandler.cpp:246
+msgid "Over characters list."
+msgstr "Забагато персонажів."
+
+#: src/net/eathena/generalhandler.cpp:249
+msgid "Ip blocked."
+msgstr "IP-адреса заблокована."
+
+#: src/net/eathena/generalhandler.cpp:252
+msgid "Invalid password count."
+msgstr "Некоректний розмір паролю."
+
+#: src/net/eathena/generalhandler.cpp:255
+msgid "Not allowed race."
+msgstr "Недозволена раса."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:202
+msgid "Unknown connection error."
+msgstr "Невідома помилка з'єднання."
+
+#: src/net/eathena/generalhandler.cpp:268
+msgid "Map not found"
+msgstr "Мапу не знайдено."
+
+#. TRANSLATORS: error message
+#: src/net/eathena/generalhandler.cpp:345 src/net/tmwa/generalhandler.cpp:288
+msgid "Got disconnected from server!"
+msgstr "Відключений від серверу!"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:370 src/net/tmwa/generalhandler.cpp:316
+msgid "Strength"
+msgstr "Сила"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:371 src/net/tmwa/generalhandler.cpp:318
+msgid "Agility"
+msgstr "Спритність"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:372 src/net/tmwa/generalhandler.cpp:320
+msgid "Vitality"
+msgstr "Витривалість"
+
+#: src/net/eathena/generalhandler.cpp:374 src/net/tmwa/generalhandler.cpp:323
+msgid "Intelligence"
+msgstr "Інтелект"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:375 src/net/tmwa/generalhandler.cpp:325
+msgid "Dexterity"
+msgstr "Вправність"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:376 src/net/tmwa/generalhandler.cpp:327
+msgid "Luck"
+msgstr "Талан"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:379 src/net/tmwa/generalhandler.cpp:331
+msgid "Defense"
+msgstr "Захист"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:380 src/net/tmwa/generalhandler.cpp:333
+msgid "M.Attack"
+msgstr "Маг. напад"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:381 src/net/tmwa/generalhandler.cpp:335
+msgid "M.Defense"
+msgstr "Маг. захист"
+
+#. TRANSLATORS: player stat
+#: 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:385 src/net/tmwa/generalhandler.cpp:341
+#, no-c-format
+msgid "% Evade"
+msgstr "Ухиляння (%)"
+
+#. TRANSLATORS: player stat
+#: 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:388 src/net/tmwa/generalhandler.cpp:346
+msgid "Attack Delay"
+msgstr "Затримка атаки"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:389 src/net/tmwa/generalhandler.cpp:348
+msgid "Walk Delay"
+msgstr "Затримка руху"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:350
+msgid "Attack Range"
+msgstr "Дальність атаки"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:391 src/net/tmwa/generalhandler.cpp:352
+msgid "Damage per sec."
+msgstr "Ушкодження за секунду"
+
+#: src/net/eathena/generalhandler.cpp:392
+msgid "Karma"
+msgstr "Карма"
+
+#: src/net/eathena/generalhandler.cpp:393
+msgid "Manner"
+msgstr "Манери"
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
+#, c-format
+msgid "Unknown skill error: %d"
+msgstr "Невідома похибка вміння: %d"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
+msgid "You have not yet reached a high enough lvl!"
+msgstr "У вас недостатній рівень!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
+msgid "Insufficient HP!"
+msgstr "Недостатньо здоров'я!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
+msgid "Insufficient SP!"
+msgstr "Недостатньо мани!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
+msgid "You have no memos!"
+msgstr "Записи порожні!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
+msgid "You cannot do that right now!"
+msgstr "Не можна зробити це прямо зараз!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
+msgid "Seems you need more money... ;-)"
+msgstr "Здається, в вас замало грошей... ;C"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Не можна вжити вміння з цим типом зброї!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
+msgid "You need another red gem!"
+msgstr "Вам потрібен інший червоний самоцвіт!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
+msgid "You need another blue gem!"
+msgstr "Вам потрібний інший синій самоцвіт!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
+msgid "You're carrying to much to do this!"
+msgstr "Ви забагато тримаєте, щоб це зробити!"
+
+#. TRANSLATORS: error message
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
+msgid "Huh? What's that?"
+msgstr "Що це було?!"
+
+#. TRANSLATORS: trade header
+#: src/net/ea/tradehandler.cpp:87
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Торгівля: ви та %s"
+
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:175
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s бажає торгуватись, чи ви згодні?"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:351
+msgid "Strength:"
+msgstr "Сила:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:353
+msgid "Agility:"
+msgstr "Спритність:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:355
+msgid "Vitality:"
+msgstr "Витривалість:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:357
+msgid "Intelligence:"
+msgstr "Інтелект:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:359
+msgid "Dexterity:"
+msgstr "Вправність:"
+
+#. TRANSLATORS: playe stat
+#: src/net/tmwa/charserverhandler.cpp:361
+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 "Торгівля провалилась!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:194
+msgid "Emote failed!"
+msgstr "Не вдалось вжити смайлик!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:198
+msgid "Sit failed!"
+msgstr "Не вдається присісти!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:202
+msgid "Chat creating failed!"
+msgstr "Не вдалось створити чат!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:206
+msgid "Could not join party!"
+msgstr "Не можна приєднатись до групи!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:210
+msgid "Cannot shout!"
+msgstr "Не можна кричати!"
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:277
+msgid "Warp failed..."
+msgstr "Змінювання не вдалося..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:281
+msgid "Could not steal anything..."
+msgstr "Нічого не вдалось поцупити..."
+
+#. TRANSLATORS: error message
+#: src/net/tmwa/skillhandler.cpp:285
+msgid "Poison had no effect..."
+msgstr "Отрута не подіяла..."
+
+#. TRANSLATORS: draw backend
+#: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
+#: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
+#: src/render/rendererslistsdl.h:80 src/render/rendererslistsdl.h:117
+msgid "Software"
+msgstr "Програмно"
+
+#. TRANSLATORS: draw backend
+#: src/render/rendererslistsdl2.h:47 src/render/rendererslistsdl2.h:83
+#: src/render/rendererslistsdl2.h:123
+msgid "SDL2 default"
+msgstr "SDL2 за замовчуванням"
+
+#. TRANSLATORS: draw backend
+#: src/render/rendererslistsdl2.h:49 src/render/rendererslistsdl2.h:89
+#: src/render/rendererslistsdl.h:49 src/render/rendererslistsdl.h:86
+msgid "Mobile OpenGL"
+msgstr "Мобільний OpenGL"
+
+#. TRANSLATORS: draw backend
+#: src/render/rendererslistsdl2.h:85 src/render/rendererslistsdl.h:82
+msgid "Normal OpenGL"
+msgstr "Нормальний OpenGL"
+
+#. TRANSLATORS: draw backend
+#: src/render/rendererslistsdl2.h:87 src/render/rendererslistsdl.h:84
+msgid "Safe OpenGL"
+msgstr "Безпечний OpenGL"
+
+#. TRANSLATORS: draw backend
+#: src/render/rendererslistsdl2.h:91 src/render/rendererslistsdl.h:88
+msgid "Modern OpenGL"
+msgstr "Новітній OpenGL"
+
+#. TRANSLATORS: being info default name
+#. TRANSLATORS: unknown info name
+#. TRANSLATORS: item info name
+#. 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:324 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+msgid "unnamed"
+msgstr "казна що"
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
+#, c-format
+msgid "Attack %s"
+msgstr "Атака %s"
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr "Критична атака %s"
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr "Магічна атака %s"
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
+#, c-format
+msgid "Defense %s"
+msgstr "Захист %s"
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr "Критичний захист %s"
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr "Магічний захист %s"
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
+#, c-format
+msgid "HP %s"
+msgstr "Здоров'я %s"
+
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
+#, c-format
+msgid "MP %s"
+msgstr "Мана %s"
+
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
+#, c-format
+msgid "Level %s"
+msgstr "Рівень: %s"
+
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr "Швидкість %s"
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr "Відстань %s"
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr "Ухилення %s"
+
+#. TRANSLATORS: item name
+#: src/resources/db/itemdb.cpp:210
+msgid "Unknown item"
+msgstr "Невідомий предмет"
+
+#. TRANSLATORS: unknown info name
+#: src/resources/db/petdb.cpp:98
+msgid "pet"
+msgstr "улюбленець"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:39
+msgid "Thanks for buying."
+msgstr "Дякуємо за покупку."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:43
+msgid "Unable to buy."
+msgstr "Неможливо придбати."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:47
+msgid "Unable to buy. You don't have enough money."
+msgstr "Неможливо придбати. У вас недостатньо грошей!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+msgid "Unable to buy. It is too heavy."
+msgstr "Неможливо придбати. Предмет заважкий!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr "Неможливо придбати. Ви маєте забагато предметів!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
+msgid "Nothing to sell."
+msgstr "Немає що продавати."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:63
+msgid "Thanks for selling."
+msgstr "Дякуємо за продажу!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:67
+msgid "Unable to sell."
+msgstr "Неможливо продати."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:71
+msgid "Unable to sell while trading."
+msgstr "Неможливо продати під час торгівлі."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:75
+msgid "Unable to sell unsellable item."
+msgstr "Не можна продати те, що не можна продати!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:79
+#, c-format
+msgid "Online users: %d"
+msgstr "Онлайн гравців: %d"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:83
+msgid "Guild created."
+msgstr "Гільдію створено."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:87
+msgid "You are already in a guild."
+msgstr "Ви вже є членом гільдії."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:91
+msgid "Emperium check failed."
+msgstr "Імперську перевірку провалено."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:95
+msgid "Unknown server response."
+msgstr "Невідома серверна відповідь."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:99
+msgid "You have left the guild."
+msgstr "Ви залишили гільдію."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:103
+msgid "Could not invite user to guild."
+msgstr "Не вдалось запросити гравця до гільдії."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:107
+msgid "User rejected guild invite."
+msgstr "Гравець відмовився від запрошення до гільдії."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:111
+msgid "User is now part of your guild."
+msgstr "Гравець увійшов до вашої гільдії."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:115
+msgid "Your guild is full."
+msgstr "В гільдії немає місця."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:119
+msgid "Unknown guild invite response."
+msgstr "Невідоме відповідь на запрошення до гільдії."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:123
+#, c-format
+msgid "%s has left your guild."
+msgstr "%s залишив гільдію."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:127
+msgid "You were kicked from guild."
+msgstr "Вас виштовхали з гільдії."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:131
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s виштовхав вас з гільдії."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:135
+msgid "Failed to use item."
+msgstr "Не вдалось застосувати предмет."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:139
+msgid "Unable to equip."
+msgstr "Неможливо вдягти."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr "Неможливо вдягти, бо в тебе недостатній рівень."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "Couldn't create party."
+msgstr "Не вдалось створити групу."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "Party successfully created."
+msgstr "Групу створено."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
+msgid "You have left the party."
+msgstr "Ви залишили групу."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:159
+msgid "You can't leave party on this map."
+msgstr "Не можна залишити групу на цій мапі."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:163
+msgid "You were kicked from party."
+msgstr "Вас виштовхали з групи."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:167
+msgid "You can't be kicked from party on this map."
+msgstr "Не можна бути виштовханим з групи на цій мапі!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:171
+#, c-format
+msgid "%s has joined your party."
+msgstr "%s увійшов до вашої групи."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:175
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s вже є членом групи."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:179
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s відмовився від запрошення."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:183
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s тепер член вашої групи."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:187
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr "%s не може приєднатись до вашої групи - немає місця!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:191
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr "QQQ Невідома відповідь на запрошення для %s."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
+#, c-format
+msgid "%s has left your party."
+msgstr "%s залишив вашу групу."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
+msgid "%s can't be kicked from party on this map."
+msgstr "%s неможливо виштовхати з групи на цій мапі."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:227
+#, c-format
+msgid "%s has kicked from your party."
+msgstr "Гравця %s виштовхано з вашої групи."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:235
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Невідомий учасник намагався сказати: %s"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:239
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s не в групі!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:243
+#, c-format
+msgid "You picked up %s."
+msgstr "Ти отримуєш: %s."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:247
+#, c-format
+msgid "You spent %s."
+msgstr "Ви витратили %s."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:251
+msgid "Cannot raise skill!"
+msgstr "Не можна підвисити вміння!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:255
+msgid "Equip ammunition first."
+msgstr "Спершу озбройтесь боєприпасами."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:259
+#, c-format
+msgid "Trading with %s isn't possible. Trade partner is too far away."
+msgstr "Торгівля з %s неможлива. Партнер знаходиться надто далеко."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:264
+#, c-format
+msgid "Trading with %s isn't possible. Character doesn't exist."
+msgstr "Торгівля з %s неможлива. Персонаж не існує!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:268
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Торгівлю скасовано за невідомих причин."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:272
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Торгівлю з %s скасовано."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:276
+#, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "Торгівлю з %s скасовано, гравець зайнятий"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
+#, c-format
+msgid "Unhandled trade cancel packet with %s"
+msgstr "Невідомий пакет під час торгівлі з %s"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:284
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Неможливо додати предмет. Партнер перевантажений."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:288
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Неможливо додати предмет. Партнер вичерпав вільне місце для предметів."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:292
+msgid "Failed adding item. You can't trade this item."
+msgstr "Додавання предмету не вдалось. Не можна торгуватись цим предметом."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:296
+msgid "Failed adding item for unknown reason."
+msgstr "За невідомих причин не вдається додати предмет."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:300
+msgid "Trade canceled."
+msgstr "Торгівлю відмінено."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:304
+msgid "Trade completed."
+msgstr "Торгівлю здійснено."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:308
+msgid "Kick failed!"
+msgstr "Виштовхування не вдалося!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:312
+msgid "Kick succeeded!"
+msgstr "Виштовхування вдалося!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:316
+#, c-format
+msgid "MVP player: %s"
+msgstr "MVP гравець: %s"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:320
+msgid "All whispers ignored."
+msgstr "Всі приватні повідомлення ігноровані."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:324
+msgid "All whispers ignore failed."
+msgstr "Не вдалось встановити ігнорування всіх приватних повідомлень."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:328
+msgid "All whispers unignored."
+msgstr "Відмінене ігнорування всіх приватних повідомлень."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:332
+msgid "All whispers unignore failed."
+msgstr "Відмінена ігнорування приватних повідомлень не спрацювала."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:339
+msgid "pvp off, gvg off"
+msgstr "PVP неакт., GVG неакт."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:343
+msgid "pvp on"
+msgstr "PVP акт."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:347
+msgid "gvg on"
+msgstr "GVG акт."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:351
+msgid "pvp on, gvg on"
+msgstr "PVP акт., GVG акт."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:355
+msgid "unknown pvp"
+msgstr "невідомий стан PVP"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:359
+#, c-format
+msgid "Char from account %s is already in your party!"
+msgstr "Гравець з акаунту %s все є в вашій групі!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:363
+#, c-format
+msgid "%s blocked invite!"
+msgstr "%s заборонив запрошення!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:367
+msgid "Char is not online!"
+msgstr "Гравець відсутній!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:371
+msgid "Pet catch failed."
+msgstr "Не вдалося завести улюбленця."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:375
+msgid "Pet catched."
+msgstr "Улюбленця обрано."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:379
+#, c-format
+msgid "Pet catch unknown error: %d."
+msgstr "Невідома помилка відлову улюбленця: %d."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:383
+msgid "Your mercenary duty hour is over."
+msgstr "Час чергування вашого крамаря закінчився."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:387
+msgid "Your mercenary was killed."
+msgstr "Вашого крамаря вбито."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Your mercenary was fired."
+msgstr "Вашого крамаря звільнено."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Your mercenary run away."
+msgstr "Ваш крамар накивав п'ятами."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:399
+msgid "Mercenary unknown state."
+msgstr "Невідомий стан крамаря."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:403
+msgid "You feed your homunculus."
+msgstr "Гомункула нагодовано."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:407
+#, c-format
+msgid "You can't feed homunculus, because you don't have any %s."
+msgstr "Нема чим годувати гомункула :C, жодного %s."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:411
+msgid "Card insert failed."
+msgstr "Помилка від час вставлення картки."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:415
+msgid "Card inserted."
+msgstr "Картку вставлено."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:419
+msgid ""
+"Deposit failed. You probably don't have this amount of money with you right "
+"now."
+msgstr "Вказана сума для депозиту не відповідає наявним коштам."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:424
+msgid ""
+"Withdraw failed. You probably don't have this amount of money in the bank "
+"right now."
+msgstr "Банк не збирається видавати вам кредити!"
+
+#. TRANSLATORS: chat option changed message
+#: src/utils/booleanoptions.h:27
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "Можливими опціями для /%s є: \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
diff --git a/po/vls.po b/po/vls.po
index 6e4adc00c..57e2bbbd0 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-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: Vlaams (http://www.transifex.com/projects/p/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,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 ""
 
@@ -31,7 +31,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
@@ -42,231 +42,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr ""
 
 #. 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 ""
 
@@ -286,25 +289,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 ""
 
@@ -416,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: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 ""
 
@@ -491,9 +494,9 @@ msgstr ""
 #. 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"
@@ -544,14 +547,14 @@ msgstr ""
 #: 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 ""
 
@@ -1048,7 +1051,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 ""
 
@@ -1232,8 +1235,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 ""
 
@@ -1484,7 +1487,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 ""
 
@@ -1507,23 +1510,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
@@ -1544,7 +1547,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 ""
@@ -1559,54 +1562,50 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
@@ -1624,9 +1623,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 ""
@@ -1635,7 +1634,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 ""
@@ -1647,9 +1646,9 @@ msgstr ""
 #. 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 ""
@@ -1662,7 +1661,7 @@ msgstr ""
 #. 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
@@ -1673,26 +1672,26 @@ msgstr ""
 #. 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 ""
 
@@ -1700,19 +1699,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 ""
 
@@ -1720,19 +1719,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 ""
 
@@ -1740,8 +1739,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
@@ -1753,7 +1752,7 @@ msgstr ""
 
 #. 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 ""
 
@@ -1761,44 +1760,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 ""
 
 #. 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 ""
 
@@ -1808,20 +1807,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 ""
 
@@ -1830,77 +1829,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 ""
 
@@ -1910,79 +1909,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 ""
 
@@ -1991,64 +1982,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 ""
 
-#. 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 ""
 
-#. 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 ""
 
@@ -2058,9 +2033,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
@@ -2068,41 +2043,41 @@ msgid "Use"
 msgstr ""
 
 #. 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 ""
 
@@ -2110,155 +2085,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 ""
 
@@ -2266,50 +2241,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 ""
 
 #. 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 ""
-
-#. 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 ""
 
@@ -2357,8 +2325,9 @@ msgstr ""
 #: 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 ""
 
@@ -2596,7 +2565,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"
@@ -2618,7 +2587,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
@@ -2631,7 +2600,7 @@ msgstr ""
 #. 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
@@ -2644,7 +2613,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
@@ -2656,7 +2625,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"
@@ -2664,8 +2633,8 @@ msgstr ""
 
 #. 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 ""
@@ -3857,7 +3826,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 ""
 
@@ -3986,7 +3955,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 ""
 
@@ -4913,7 +4882,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 ""
 
@@ -4924,8 +4893,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 ""
 
@@ -5066,19 +5035,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"
@@ -5166,7 +5135,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 ""
 
@@ -5174,7 +5143,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:"
@@ -5184,11 +5153,11 @@ 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: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 ""
@@ -5197,72 +5166,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr ""
 
 #. 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 ""
@@ -5305,8 +5274,8 @@ msgstr ""
 #. 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 ""
 
@@ -5375,7 +5344,7 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. 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 ""
@@ -5492,7 +5461,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
@@ -5503,6 +5472,11 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5987,11 +5961,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 ""
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6040,111 +6014,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr ""
 
-#: 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 ""
 
@@ -6293,12 +6267,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr ""
 
 #. 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 ""
@@ -6319,27 +6293,27 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6740,22 +6714,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6815,18 +6789,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
@@ -6849,286 +6861,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"
+msgid "Input ignore"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
+msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
+msgid "Ignore input 2"
 msgstr ""
 
 #. 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 ""
@@ -7383,12 +7437,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 ""
 
@@ -7543,8 +7597,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 ""
 
@@ -7662,59 +7716,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"
@@ -7722,26 +7755,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 ""
@@ -7757,27 +7796,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 ""
 
@@ -7814,256 +7853,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -8128,13 +8167,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 ""
@@ -8170,6 +8209,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 ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 876f93c50..62477c8b7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2014-12-28 19:54+0300\n"
-"PO-Revision-Date: 2014-12-11 10:00+0000\n"
+"PO-Revision-Date: 2014-12-29 09:57+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"
@@ -6794,27 +6794,23 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:43
-#, fuzzy
 msgid "Move player up"
-msgstr "显示球员弹出窗口"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:49
-#, fuzzy
 msgid "Move player down"
-msgstr "向下移动"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:55
-#, fuzzy
 msgid "Move player left"
-msgstr "向左移动"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:61
-#, fuzzy
 msgid "Move player right"
-msgstr "向右移动"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:67
@@ -6823,27 +6819,23 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:73
-#, fuzzy
 msgid "Move pet up"
-msgstr "x"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:79
-#, fuzzy
 msgid "Move pet down"
-msgstr "向下移动"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:85
-#, fuzzy
 msgid "Move pet left"
-msgstr "向左移动"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:91
-#, fuzzy
 msgid "Move pet right"
-msgstr "向右移动"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/move.cpp:97
@@ -6881,9 +6873,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:36
-#, fuzzy
 msgid "Input ignore"
-msgstr "忽略"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
@@ -6897,9 +6888,8 @@ msgstr "忽略输入2"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:54
-#, fuzzy
 msgid "Direction keys"
-msgstr "直接下"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:60
@@ -6908,45 +6898,38 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:66
-#, fuzzy
 msgid "Player direct down"
-msgstr "的位置:"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:72
-#, fuzzy
 msgid "Player direct left"
-msgstr "直接离开"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:78
-#, fuzzy
 msgid "Player direct right"
-msgstr "直接对"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:84
-#, fuzzy
 msgid "Pet direct up"
-msgstr "直接向上"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:90
-#, fuzzy
 msgid "Pet direct down"
-msgstr "直接下"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:96
-#, fuzzy
 msgid "Pet direct left"
-msgstr "直接离开"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:102
-#, fuzzy
 msgid "Pet direct right"
-msgstr "直接对"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:114
@@ -7195,9 +7178,8 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:416
-#, fuzzy
 msgid "Pet ai start"
-msgstr "复位统计"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:422
diff --git a/po/zh_HK.po b/po/zh_HK.po
index b78e2a34a..e9019bc7d 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-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: Chinese (Hong Kong) (http://www.transifex.com/projects/p/manaplus/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:131
+#: src/actions/actions.cpp:139
 msgid "File uploaded"
 msgstr ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 "確定"
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr ""
 
 #. 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 ""
 
@@ -416,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: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 ""
 
@@ -491,9 +494,9 @@ msgstr "說明"
 #. 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"
@@ -544,14 +547,14 @@ msgstr ""
 #: 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 "錯誤"
 
@@ -1048,7 +1051,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 ""
 
@@ -1232,8 +1235,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 ""
 
@@ -1484,7 +1487,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 ""
 
@@ -1507,23 +1510,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
@@ -1544,7 +1547,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 "交易"
@@ -1559,54 +1562,50 @@ msgstr "交易"
 #. 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 ""
 
 #. 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 ""
 
@@ -1624,9 +1623,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 ""
@@ -1635,7 +1634,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 ""
@@ -1647,9 +1646,9 @@ msgstr ""
 #. 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 "購買"
@@ -1662,7 +1661,7 @@ msgstr "購買"
 #. 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
@@ -1673,26 +1672,26 @@ msgstr "出售"
 #. 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 ""
 
@@ -1700,19 +1699,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 ""
 
@@ -1720,19 +1719,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 ""
 
@@ -1740,8 +1739,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
@@ -1753,7 +1752,7 @@ msgstr "卸下裝備"
 
 #. 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 ""
 
@@ -1761,44 +1760,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 "玩家"
 
 #. 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 ""
 
@@ -1808,20 +1807,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 ""
 
@@ -1830,77 +1829,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 ""
 
@@ -1910,79 +1909,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 ""
 
@@ -1991,64 +1982,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 ""
 
-#. 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 ""
 
-#. 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 ""
 
@@ -2058,9 +2033,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
@@ -2068,41 +2043,41 @@ msgid "Use"
 msgstr "使用"
 
 #. 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 ""
 
@@ -2110,155 +2085,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 ""
 
@@ -2266,50 +2241,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 "丟棄"
 
 #. 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 "分開"
-
-#. 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 ""
 
@@ -2357,8 +2325,9 @@ msgstr ""
 #: 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 ""
 
@@ -2596,7 +2565,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"
@@ -2618,7 +2587,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
@@ -2631,7 +2600,7 @@ msgstr "離開"
 #. 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
@@ -2644,7 +2613,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
@@ -2656,7 +2625,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"
@@ -2664,8 +2633,8 @@ msgstr ""
 
 #. 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 ""
@@ -3857,7 +3826,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 "商店"
 
@@ -3986,7 +3955,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 ""
 
@@ -4913,7 +4882,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 "裝備"
 
@@ -4924,8 +4893,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 "物品攔"
 
@@ -5066,19 +5035,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"
@@ -5166,7 +5135,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 ""
 
@@ -5174,7 +5143,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:"
@@ -5184,11 +5153,11 @@ 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: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 ""
@@ -5197,72 +5166,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 "男生"
 
 #. 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 "女生"
 
 #. 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 "請分配%d點數"
 
 #. 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 "你的名字至少需要4個字元."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
 #. 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 "請移除%d點數"
@@ -5305,8 +5274,8 @@ msgstr "開始"
 #. 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 ""
 
@@ -5375,7 +5344,7 @@ msgid "Whispering to %s: %s"
 msgstr "對%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 ""
@@ -5492,7 +5461,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
@@ -5503,6 +5472,11 @@ msgstr ""
 msgid "Equip"
 msgstr "裝備"
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr "分開"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5985,11 +5959,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 ""
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6038,111 +6012,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr ""
 
-#: 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 ""
 
@@ -6291,12 +6265,12 @@ msgid "You give:"
 msgstr "你付出:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr ""
 
 #. 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 "增加物品失敗。你不能覆蓋視窗中的該類物品能."
@@ -6317,27 +6291,27 @@ msgstr "更新中..."
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 "已完成"
 
@@ -6738,22 +6712,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -6813,18 +6787,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
@@ -6847,286 +6859,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"
+msgid "Input ignore"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
+msgid "Ignore input 1"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
+msgid "Ignore input 2"
 msgstr ""
 
 #. 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 ""
@@ -7381,12 +7435,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 ""
 
@@ -7541,8 +7595,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 ""
 
@@ -7660,59 +7714,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"
@@ -7720,26 +7753,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 ""
@@ -7755,27 +7794,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 ""
 
@@ -7812,256 +7851,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 "和伺服器失去連線!"
 
 #. 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 "力量"
 
 #. 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 "敏捷"
 
 #. 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 "體力"
 
-#: 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 "智力"
 
 #. 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 "閃躲"
 
 #. 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 "幸運"
 
 #. 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 ""
 
@@ -8126,13 +8165,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 ""
@@ -8168,6 +8207,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 ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a015a66fe..0d6a6dad4 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-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: Chinese (Taiwan) (http://www.transifex.com/projects/p/manaplus/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:131
+#: src/actions/actions.cpp:139
 msgid "File uploaded"
 msgstr ""
 
@@ -32,7 +32,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
@@ -43,231 +43,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 "確定"
 
 #. 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 "傳送密語失敗!"
 
 #. 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 "漏掉隊伍名稱."
 
 #. 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 "\"ENTER\"切換聊天."
 
-#: src/actions/chat.cpp:357
+#: src/actions/chat.cpp:401
 msgid "Message closes chat."
 msgstr "關閉密語."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:368
+#: src/actions/chat.cpp:412
 msgid "Return now toggles chat."
 msgstr "\"ENTER\"切換聊天."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:377
+#: src/actions/chat.cpp:421
 msgid "Message now closes chat."
 msgstr "切換聊天."
 
 #. 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 ""
 
@@ -287,25 +290,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 ""
 
-#: src/being/being.cpp:563
+#: src/being/being.cpp:564
 msgid "miss"
 msgstr ""
 
 #. 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 ""
 
@@ -416,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: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 ""
 
@@ -491,9 +494,9 @@ msgstr "說明"
 #. 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"
@@ -544,14 +547,14 @@ msgstr ""
 #: 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 "錯誤"
 
@@ -1048,7 +1051,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 ""
 
@@ -1232,8 +1235,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 ""
 
@@ -1484,7 +1487,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 ""
 
@@ -1507,23 +1510,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
@@ -1544,7 +1547,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 "交易"
@@ -1559,54 +1562,50 @@ msgstr "交易"
 #. 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 "攻擊"
 
 #. 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 ""
 
@@ -1624,9 +1623,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 ""
@@ -1635,7 +1634,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 "說話"
@@ -1647,9 +1646,9 @@ msgstr "說話"
 #. 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 "購買"
@@ -1662,7 +1661,7 @@ msgstr "購買"
 #. 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
@@ -1673,26 +1672,26 @@ msgstr "出售"
 #. 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 ""
 
@@ -1700,19 +1699,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 ""
 
@@ -1720,19 +1719,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 ""
 
@@ -1740,8 +1739,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
@@ -1753,7 +1752,7 @@ msgstr "卸下裝備"
 
 #. 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 ""
 
@@ -1761,44 +1760,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 "玩家"
 
 #. 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 ""
 
@@ -1808,20 +1807,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 ""
 
@@ -1830,77 +1829,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 ""
 
@@ -1910,79 +1909,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 ""
 
@@ -1991,64 +1982,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 "寄放"
 
-#. 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 "取回"
 
-#. 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 ""
 
@@ -2058,9 +2033,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
@@ -2068,41 +2043,41 @@ msgid "Use"
 msgstr "使用"
 
 #. 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 ""
 
@@ -2110,155 +2085,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 ""
 
@@ -2266,50 +2241,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 "丟棄"
 
 #. 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 "分開"
-
-#. 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 ""
 
@@ -2357,8 +2325,9 @@ msgstr "聊天"
 #: 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 ""
 
@@ -2596,7 +2565,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"
@@ -2618,7 +2587,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
@@ -2631,7 +2600,7 @@ msgstr "離開"
 #. 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
@@ -2644,7 +2613,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
@@ -2656,7 +2625,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"
@@ -2664,8 +2633,8 @@ msgstr "最大"
 
 #. 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 "價格: %s / 總共: %s"
@@ -3857,7 +3826,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 "商店"
 
@@ -3986,7 +3955,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 ""
 
@@ -4913,7 +4882,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 "裝備"
 
@@ -4924,8 +4893,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 "物品攔"
 
@@ -5066,19 +5035,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"
@@ -5166,7 +5135,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 ""
 
@@ -5174,7 +5143,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:"
@@ -5184,11 +5153,11 @@ 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: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 ""
@@ -5197,72 +5166,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 "男生"
 
 #. 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 "女生"
 
 #. 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 "請分配%d點數"
 
 #. 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 "你的名字至少需要4個字元."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:471
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
 #. 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 "請移除%d點數"
@@ -5305,8 +5274,8 @@ msgstr "開始"
 #. 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 "資訊"
 
@@ -5375,7 +5344,7 @@ msgid "Whispering to %s: %s"
 msgstr "對%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 ""
@@ -5492,7 +5461,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
@@ -5503,6 +5472,11 @@ msgstr ""
 msgid "Equip"
 msgstr "裝備"
 
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:190
+msgid "Split"
+msgstr "分開"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:162
 msgid "All"
@@ -5985,11 +5959,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 "要求交易"
 
-#: src/gui/windows/shopwindow.cpp:776
+#: src/gui/windows/shopwindow.cpp:782
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -6038,111 +6012,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 "收到派對邀請,但而有另一個存在."
 
 #. 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 邀請你參加他們的派對."
 
 #. 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 邀請你參加 %s 派對."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:484
+#: src/gui/windows/socialwindow.cpp:486
 msgid "Accept Party Invite"
 msgstr "接受派對邀請"
 
-#: 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 ""
 
@@ -6291,12 +6265,12 @@ msgid "You give:"
 msgstr "你付出:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:407
+#: src/gui/windows/tradewindow.cpp:409
 msgid "You don't have enough money."
 msgstr "你沒有足夠的金錢."
 
 #. 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 "增加物品失敗。你不能覆蓋視窗中的該類物品能."
@@ -6317,27 +6291,27 @@ msgstr "更新中..."
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: 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  更新的程序不完整."
 
 #. 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  強烈建議"
 
 #. 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 "已完成"
 
@@ -6738,22 +6712,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 "上移"
 
 #. 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 "下移"
 
 #. 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 "左移"
 
 #. 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 "右移"
 
@@ -6813,18 +6787,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
@@ -6847,286 +6859,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 "忽略輸入 1"
+msgid "Input ignore"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:42
-msgid "Ignore input 2"
-msgstr "忽略輸入 2"
+msgid "Ignore input 1"
+msgstr "忽略輸入 1"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:48
-msgid "Direct Up"
-msgstr ""
+msgid "Ignore input 2"
+msgstr "忽略輸入 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 ""
@@ -7381,12 +7435,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 ""
 
@@ -7541,8 +7595,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 ""
 
@@ -7660,59 +7714,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"
@@ -7720,26 +7753,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 ""
@@ -7755,27 +7794,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 ""
 
@@ -7812,256 +7851,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 "和伺服器失去連線!"
 
 #. 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 "力量"
 
 #. 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 "敏捷"
 
 #. 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 "體力"
 
-#: 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 "智力"
 
 #. 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 "閃躲"
 
 #. 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 "幸運"
 
 #. 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 ""
 
@@ -8126,13 +8165,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 請求交易, 是否接受?"
@@ -8168,6 +8207,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 ""
author	Andrei Karas <akaras@inbox.ru>	2014-12-29 20:11:23 +0300
committer	Andrei Karas <akaras@inbox.ru>	2014-12-29 20:11:23 +0300
commit	57a6a4ab0fe9143e1cd3b566e5e9a7da1cee2429 (patch)
tree	9b057c46893e5b50613c22efdde8bbf008ebcbd6 /po
parent	ce2bd403c4d9297768d67ec615c2748fe4674333 (diff)
download	mv-57a6a4ab0fe9143e1cd3b566e5e9a7da1cee2429.tar.gz mv-57a6a4ab0fe9143e1cd3b566e5e9a7da1cee2429.tar.bz2 mv-57a6a4ab0fe9143e1cd3b566e5e9a7da1cee2429.tar.xz mv-57a6a4ab0fe9143e1cd3b566e5e9a7da1cee2429.zip