Update translations.

38 files changed, 7146 insertions, 5850 deletions

diff --git a/po/ar.po b/po/ar.po
index 18571e6fc..057ba552d 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Arabic (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -405,53 +405,53 @@ msgstr[5] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -489,43 +489,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "تثبيت"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "مرئية"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -537,9 +542,10 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -549,32 +555,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -588,7 +594,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -597,48 +603,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr "خطأ"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -662,49 +798,49 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr ""
 
@@ -1099,32 +1235,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2137,8 +2273,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "استخدام"
@@ -2809,7 +2945,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3873,12 +4009,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "تفعيل عصا الألعاب"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5664,8 +5800,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr ""
 
@@ -5747,12 +5883,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6515,24 +6651,24 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6893,25 +7029,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6919,7 +7055,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8054,136 +8190,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8403,34 +8409,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8808,32 +8814,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr "القوّة:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr "خفّة الحركة:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr "نشاط:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr "ذكاء:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr "المهارة:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8927,7 +8933,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
@@ -8938,74 +8944,140 @@ msgstr ""
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr ""
 
@@ -9134,7 +9206,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/bg.po b/po/bg.po
index ee0c33ebd..0b85bb4cd 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -401,53 +401,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -485,43 +485,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -533,9 +538,10 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -545,32 +551,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -584,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -593,48 +599,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -658,49 +794,49 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr ""
 
@@ -1095,32 +1231,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2133,8 +2269,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
@@ -2805,7 +2941,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3869,12 +4005,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5660,8 +5796,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr ""
 
@@ -5743,12 +5879,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6503,24 +6639,24 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6881,25 +7017,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6907,7 +7043,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8042,136 +8178,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8391,34 +8397,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8796,32 +8802,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8915,7 +8921,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
@@ -8926,74 +8932,140 @@ msgstr ""
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr ""
 
@@ -9122,7 +9194,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/ca.po b/po/ca.po
index e25d6d4f6..543a31d29 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
 "ca/)\n"
@@ -8981,15 +8981,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "(?) atac"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "(?) atac"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9011,15 +9011,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "Defensa màgica"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "Defensa màgica"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9035,15 +9035,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "Defensa màgica"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "Defensa màgica"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
diff --git a/po/cs.po b/po/cs.po
index 6f617a1de..4b96a7c79 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: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
 "cs/)\n"
@@ -9004,15 +9004,15 @@ msgstr "Útok %s"
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "Magický útok %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "Magický útok %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9034,15 +9034,15 @@ msgstr "Obrana %s"
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "Magiská obrana %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "Magiská obrana %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9058,15 +9058,15 @@ msgstr "Magiská obrana %s"
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "Magiská obrana %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "Magiská obrana %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
@@ -9076,9 +9076,9 @@ msgstr "BŽ %s"
 
 #. TRANSLATORS: item info label (max health)
 #: src/resources/db/itemdb.cpp:123
-#, fuzzy, c-format
+#, c-format
 msgid "Max HP %s"
-msgstr "BŽ %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (mana)
 #: src/resources/db/itemdb.cpp:125
@@ -9088,9 +9088,9 @@ msgstr "BM %s"
 
 #. TRANSLATORS: item info label (max mana)
 #: src/resources/db/itemdb.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "Max MP %s"
-msgstr "BM %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (level)
 #: src/resources/db/itemdb.cpp:129
@@ -9118,15 +9118,15 @@ msgstr "Útěk %s"
 
 #. TRANSLATORS: item info label (min flee)
 #: src/resources/db/itemdb.cpp:137
-#, fuzzy, c-format
+#, c-format
 msgid "Min flee %s"
-msgstr "Útěk %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "Útěk %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
@@ -9263,9 +9263,9 @@ msgstr "Byl jste vykopnut z gildy."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%s byl vykopnut z vaší gildy."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/de.po b/po/de.po
index d51b6f042..5a158f03e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -34,7 +34,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-04 13:10+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
 "de/)\n"
@@ -9173,15 +9173,15 @@ msgstr "Angriff %s"
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "M. Angriff %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "M. Angriff %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9203,15 +9203,15 @@ msgstr "Verteidigung %s"
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "M. Verteidigung %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "M. Verteidigung %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9227,15 +9227,15 @@ msgstr "M. Verteidigung %s"
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "M. Verteidigung %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "M. Verteidigung %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
@@ -9245,9 +9245,9 @@ msgstr "HP %s"
 
 #. TRANSLATORS: item info label (max health)
 #: src/resources/db/itemdb.cpp:123
-#, fuzzy, c-format
+#, c-format
 msgid "Max HP %s"
-msgstr "HP %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (mana)
 #: src/resources/db/itemdb.cpp:125
@@ -9257,9 +9257,9 @@ msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
 #: src/resources/db/itemdb.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "Max MP %s"
-msgstr "MP %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (level)
 #: src/resources/db/itemdb.cpp:129
@@ -9287,21 +9287,21 @@ msgstr "Fliehen %s"
 
 #. TRANSLATORS: item info label (min flee)
 #: src/resources/db/itemdb.cpp:137
-#, fuzzy, c-format
+#, c-format
 msgid "Min flee %s"
-msgstr "Fliehen %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "Fliehen %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
-#, fuzzy, c-format
+#, c-format
 msgid "Card slots %s"
-msgstr "Karten: "
+msgstr ""
 
 #. TRANSLATORS: item name
 #: src/resources/db/itemdb.cpp:240
@@ -9432,9 +9432,9 @@ msgstr "Du wurdest aus der Gilde rausgeworfen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%s wurde aus deiner Gilde geworfen."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/en_GB.po b/po/en_GB.po
index eee0c71b2..782e1910f 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -33,9 +33,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -53,126 +53,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr "Cannot send empty whispers!"
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 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:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -180,115 +180,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr "Return toggles chat."
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr "Message closes chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr "Return now toggles chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr "Message now closes chat."
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -308,92 +308,92 @@ msgid "Accepting incoming trade requests"
 msgstr "Accepting incoming trade requests"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr "dodge"
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr "miss"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -402,53 +402,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -486,43 +486,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Setup"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -534,9 +539,10 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -546,32 +552,32 @@ msgid "Close"
 msgstr "Close"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr "Connecting to server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr "Logging in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr "Entering game world"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr "Requesting characters"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr "Connecting to the game server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr "Changing game servers"
 
@@ -585,7 +591,7 @@ msgstr "Changing game servers"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -594,48 +600,178 @@ msgstr "Changing game servers"
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr "Requesting registration details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr "Password Change"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Options:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -659,49 +795,49 @@ msgstr "Error creating updates directory!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr "Saving screenshot failed!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr "Network Error"
 
@@ -1096,32 +1232,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2134,8 +2270,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Use"
@@ -2806,7 +2942,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3870,12 +4006,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Enable joystick"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5661,8 +5797,8 @@ msgstr "Play"
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr "Info"
 
@@ -5744,12 +5880,12 @@ msgid "Whispering to %s: %s"
 msgstr "Whispering to %s: %s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6504,24 +6640,24 @@ msgid "Up"
 msgstr "Up"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6882,25 +7018,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6908,7 +7044,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8043,136 +8179,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Options:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8392,34 +8398,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8797,32 +8803,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s wants to trade with you, do you accept?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8916,7 +8922,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "unnamed"
@@ -8927,74 +8933,140 @@ msgstr "unnamed"
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr "Unknown item"
 
@@ -9123,7 +9195,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/eo.po b/po/eo.po
index a438a1c1c..71178fb8d 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -33,9 +33,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -53,126 +53,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -180,115 +180,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr "amiko"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr "malamiko"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -308,92 +308,92 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -402,53 +402,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -486,43 +486,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Helpo"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -534,9 +539,10 @@ msgstr "Helpo"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -546,32 +552,32 @@ msgid "Close"
 msgstr "Fermi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -585,7 +591,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -594,48 +600,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr "Eraro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -659,49 +795,49 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr ""
 
@@ -1096,32 +1232,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2134,8 +2270,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Uzi"
@@ -2806,7 +2942,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3870,12 +4006,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5661,8 +5797,8 @@ msgstr "Ludi"
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr ""
 
@@ -5744,12 +5880,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6504,24 +6640,24 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6882,25 +7018,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6908,7 +7044,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8043,136 +8179,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8392,34 +8398,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8797,32 +8803,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr "Forto:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr "Rapideco:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr "Lerteco:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8916,7 +8922,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sennoma"
@@ -8927,74 +8933,140 @@ msgstr "sennoma"
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr ""
 
@@ -9123,7 +9195,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/es.po b/po/es.po
index a7a1e8612..3c015d429 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-04 13:11+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
 "es/)\n"
@@ -9030,15 +9030,15 @@ msgstr "Ataque %s"
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "Ataque mágico %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "Ataque mágico %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9060,15 +9060,15 @@ msgstr "Defensa %s"
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "Defensa mágica %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "Defensa mágica %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9084,15 +9084,15 @@ msgstr "Defensa mágica %s"
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "Defensa mágica %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "Defensa mágica %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
@@ -9102,9 +9102,9 @@ msgstr "PV %s"
 
 #. TRANSLATORS: item info label (max health)
 #: src/resources/db/itemdb.cpp:123
-#, fuzzy, c-format
+#, c-format
 msgid "Max HP %s"
-msgstr "PV %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (mana)
 #: src/resources/db/itemdb.cpp:125
@@ -9114,9 +9114,9 @@ msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
 #: src/resources/db/itemdb.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "Max MP %s"
-msgstr "MP %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (level)
 #: src/resources/db/itemdb.cpp:129
@@ -9144,21 +9144,21 @@ msgstr "Escaparse %s"
 
 #. TRANSLATORS: item info label (min flee)
 #: src/resources/db/itemdb.cpp:137
-#, fuzzy, c-format
+#, c-format
 msgid "Min flee %s"
-msgstr "Escaparse %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "Escaparse %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
-#, fuzzy, c-format
+#, c-format
 msgid "Card slots %s"
-msgstr "Tarjetas: "
+msgstr ""
 
 #. TRANSLATORS: item name
 #: src/resources/db/itemdb.cpp:240
@@ -9289,9 +9289,9 @@ msgstr "Fuiste expulsado del gremio."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%s ha sido expulsado de tu gremio."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/et.po b/po/et.po
index 75866a5a4..bb8addb90 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Estonian (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -401,53 +401,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -485,43 +485,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Abi"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -533,9 +538,10 @@ msgstr "Abi"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -545,32 +551,32 @@ msgid "Close"
 msgstr "Sulge"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -584,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -593,48 +599,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr "Viga"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -658,49 +794,49 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr ""
 
@@ -1095,32 +1231,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2133,8 +2269,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
@@ -2805,7 +2941,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3869,12 +4005,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5660,8 +5796,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr ""
 
@@ -5743,12 +5879,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6503,24 +6639,24 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6881,25 +7017,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6907,7 +7043,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8042,136 +8178,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8391,34 +8397,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8796,32 +8802,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8915,7 +8921,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
@@ -8926,74 +8932,140 @@ msgstr ""
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr ""
 
@@ -9122,7 +9194,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/fa.po b/po/fa.po
index 0bcb49f1e..e22fad7b0 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Persian (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr "تایید"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -400,53 +400,53 @@ msgstr[0] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -484,43 +484,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -532,9 +537,10 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -544,32 +550,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -583,7 +589,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -592,48 +598,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr "خطا"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -657,49 +793,49 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr "کلی"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr "خطای شبکه"
 
@@ -1094,32 +1230,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2132,8 +2268,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
@@ -2804,7 +2940,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3868,12 +4004,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5659,8 +5795,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr ""
 
@@ -5742,12 +5878,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6500,24 +6636,24 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6878,25 +7014,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6904,7 +7040,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8039,136 +8175,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8388,34 +8394,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8793,32 +8799,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8912,7 +8918,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
@@ -8923,74 +8929,140 @@ msgstr ""
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr ""
 
@@ -9119,7 +9191,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/fi.po b/po/fi.po
index a6934a4c9..2bebc7b94 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: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
 "fi/)\n"
@@ -8978,15 +8978,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "(?) hyökkäys"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "(?) hyökkäys"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9008,15 +9008,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "T.-puolustus"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "Jäsenmaksimi: %d"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9032,15 +9032,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "T.-puolustus"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "T.-puolustus"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
@@ -9098,9 +9098,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "Jäsenmaksimi: %d"
+msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
@@ -9237,9 +9237,9 @@ msgstr "Sinut potkittiin ulos killasta."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%s on potkittu ulos killastasi."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/fr.po b/po/fr.po
index 7d933e784..c5fcd2d3d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -22,7 +22,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
 "fr/)\n"
@@ -9041,15 +9041,15 @@ msgstr "Attaque %s"
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "Attaque M. %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "Attaque M. %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9071,15 +9071,15 @@ msgstr "Défense %s"
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "Défense M. %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "Défense M. %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9095,15 +9095,15 @@ msgstr "Défense M. %s"
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "Défense M. %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "Défense M. %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
@@ -9113,9 +9113,9 @@ msgstr "PV %s"
 
 #. TRANSLATORS: item info label (max health)
 #: src/resources/db/itemdb.cpp:123
-#, fuzzy, c-format
+#, c-format
 msgid "Max HP %s"
-msgstr "PV %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (mana)
 #: src/resources/db/itemdb.cpp:125
@@ -9125,9 +9125,9 @@ msgstr "PM %s"
 
 #. TRANSLATORS: item info label (max mana)
 #: src/resources/db/itemdb.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "Max MP %s"
-msgstr "PM %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (level)
 #: src/resources/db/itemdb.cpp:129
@@ -9155,15 +9155,15 @@ msgstr "Fuir %s"
 
 #. TRANSLATORS: item info label (min flee)
 #: src/resources/db/itemdb.cpp:137
-#, fuzzy, c-format
+#, c-format
 msgid "Min flee %s"
-msgstr "Fuir %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "Fuir %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
@@ -9300,9 +9300,9 @@ msgstr "Vous avez été exclu de la guilde."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%s a éjecté quelqu'un de ta guilde."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/he.po b/po/he.po
index 752e2bd4f..0c45fee57 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hebrew (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr "אישור"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr "לא ניתן לשלוח לחישות ריקות!"
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr "שם חבורה חסר."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr "סגירת תיבת הטקסט האוטומטית."
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr "ההודעה סוגרת את תיבת הטקסט."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr "מקש האנטר כעת סוגר את תיבת הטקסט."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr "ההודעה כעת סוגרת את תיבת הטקסט."
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr "מאשר הצעות סחר נכנסות"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -401,53 +401,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -485,43 +485,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "הגדרות"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "וידאו"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "עזרה"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -533,9 +538,10 @@ msgstr "עזרה"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -545,32 +551,32 @@ msgid "Close"
 msgstr "סגור"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -584,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -593,48 +599,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr "שגיאה"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "אפשרויות:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -658,49 +794,49 @@ msgstr "שגיאה ביצירת ספריית העדכונים!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr "כללי"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr "שמירת תמונת־מסך נכשלה!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr "שגיאת רשת"
 
@@ -1095,32 +1231,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2133,8 +2269,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "השתמש"
@@ -2805,7 +2941,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3869,12 +4005,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "אפשר ג'ויסטיק"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5660,8 +5796,8 @@ msgstr "שחק"
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr "מידע"
 
@@ -5743,12 +5879,12 @@ msgid "Whispering to %s: %s"
 msgstr "לוחש אל %s: %s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6503,24 +6639,24 @@ msgid "Up"
 msgstr "למעלה"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6881,25 +7017,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6907,7 +7043,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8042,136 +8178,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "אפשרויות:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8391,34 +8397,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8796,32 +8802,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s מעוניין לסחור עימך, האם אתה מסכים?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8915,7 +8921,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "ללא שם"
@@ -8926,74 +8932,140 @@ msgstr "ללא שם"
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr "חפץ לא ידוע"
 
@@ -9122,7 +9194,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/hr.po b/po/hr.po
index 168e586f5..9e25b5f70 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Croatian (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr "U redu"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr "Ne mogu poslati prazan šapate!"
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 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:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr "Poruka zatvara chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr "Poruka sada zatvara chat."
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -402,53 +402,53 @@ msgstr[2] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -486,43 +486,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Podešavanje"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Slika"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoć"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -534,9 +539,10 @@ msgstr "Pomoć"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -546,32 +552,32 @@ msgid "Close"
 msgstr "Zatvori"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -585,7 +591,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -594,48 +600,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr "Greška"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Opcije:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -659,49 +795,49 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr "Općenito"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr "Mreža Greška"
 
@@ -1096,32 +1232,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2134,8 +2270,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Upotrijebi"
@@ -2806,7 +2942,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3870,12 +4006,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Omogući igraću palicu"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5661,8 +5797,8 @@ msgstr "Igraj"
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr "Info"
 
@@ -5744,12 +5880,12 @@ msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6506,24 +6642,24 @@ msgid "Up"
 msgstr "Gore"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6884,25 +7020,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6910,7 +7046,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8045,136 +8181,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Opcije:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8394,34 +8400,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8799,32 +8805,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s želi trgovati s vama, prihvaćate li?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8918,7 +8924,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "neimenovano"
@@ -8929,74 +8935,140 @@ msgstr "neimenovano"
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr "Nepoznati predmet"
 
@@ -9125,7 +9197,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/hu.po b/po/hu.po
index 78333d6b7..64efdedd0 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hungarian (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr "Nem küldhetsz üres üzenetet!"
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 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:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr "Az enter megnyitja a bevitelt."
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr "Az üzenet bezárja a bevitelt."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr "Az enter mostantól megnyitja a bevitelt."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr "Az üzenet mostantól bezárja a bevitelt."
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -401,53 +401,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -485,43 +485,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Beállítások"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Videó"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Súgó"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -533,9 +538,10 @@ msgstr "Súgó"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -545,32 +551,32 @@ msgid "Close"
 msgstr "Bezár"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -584,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -593,48 +599,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr "Hiba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "Opciók:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -658,49 +794,49 @@ msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr "Általános"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
@@ -1095,32 +1231,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2133,8 +2269,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Bevet"
@@ -2805,7 +2941,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3869,12 +4005,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "Joystick engedélyezése"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5660,8 +5796,8 @@ msgstr "Játék"
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr "Infó"
 
@@ -5743,12 +5879,12 @@ msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6503,24 +6639,24 @@ msgid "Up"
 msgstr "Fejleszt"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6881,25 +7017,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6907,7 +7043,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8042,136 +8178,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "Opciók:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8391,34 +8397,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8796,32 +8802,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s üzletelni akar veled. Te akarsz vele?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8915,7 +8921,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Névtelen"
@@ -8926,74 +8932,140 @@ msgstr "Névtelen"
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr "Ismeretlen tárgy"
 
@@ -9122,7 +9194,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/id.po b/po/id.po
index d7833cee1..c37e7db40 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: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
 "id/)\n"
@@ -8974,15 +8974,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "(?)serangan"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "(?)serangan"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
diff --git a/po/it.po b/po/it.po
index 8d82998ac..463429567 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
 "it/)\n"
@@ -9001,15 +9001,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "(?) attacco"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "(?) attacco"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9031,15 +9031,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "Difesa Magica."
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "Numero massimo Membri: %d"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9055,15 +9055,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "Difesa Magica."
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "Difesa Magica."
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
@@ -9121,9 +9121,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "Numero massimo Membri: %d"
+msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
@@ -9260,9 +9260,9 @@ msgstr "Sei stato cacciato dalla Gilda."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%s e' stato espulso dalla Gilda."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/ja.po b/po/ja.po
index 0e8a42aee..823f509b1 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: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
 "ja/)\n"
@@ -8984,15 +8984,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "(?) 攻撃"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "(?) 攻撃"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9014,15 +9014,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "M.Defense"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "最大メンバー数: %d"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9038,15 +9038,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "M.Defense"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "M.Defense"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
@@ -9104,9 +9104,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "最大メンバー数: %d"
+msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
@@ -9243,9 +9243,9 @@ msgstr "ギルドから追い出されました."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%sがギルドから追い出しました."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/ka.po b/po/ka.po
index 50126cad0..56ac1abdb 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Georgian (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -400,53 +400,53 @@ msgstr[0] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -484,43 +484,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -532,9 +537,10 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -544,32 +550,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -583,7 +589,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -592,48 +598,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -657,49 +793,49 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr ""
 
@@ -1094,32 +1230,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2132,8 +2268,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
@@ -2804,7 +2940,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3868,12 +4004,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5659,8 +5795,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr ""
 
@@ -5742,12 +5878,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6500,24 +6636,24 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6878,25 +7014,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6904,7 +7040,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8039,136 +8175,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8388,34 +8394,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8793,32 +8799,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8912,7 +8918,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
@@ -8923,74 +8929,140 @@ msgstr ""
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr ""
 
@@ -9119,7 +9191,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/nb.po b/po/nb.po
index dd9ca863d..da1b42bc5 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr "Kan ikke sende tomme meldinger!"
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -401,53 +401,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -485,43 +485,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -533,9 +538,10 @@ msgstr "Hjelp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -545,32 +551,32 @@ msgid "Close"
 msgstr "Lukk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -584,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -593,48 +599,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr "Feil"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -658,49 +794,49 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr "Generelt"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr "Lagring av skjermbilde feilet!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr "Nettverksfeil"
 
@@ -1095,32 +1231,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2133,8 +2269,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Bruk"
@@ -2805,7 +2941,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3869,12 +4005,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5660,8 +5796,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr ""
 
@@ -5743,12 +5879,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6503,24 +6639,24 @@ msgid "Up"
 msgstr "Opp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6881,25 +7017,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6907,7 +7043,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8042,136 +8178,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8391,34 +8397,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8796,32 +8802,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8915,7 +8921,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
@@ -8926,74 +8932,140 @@ msgstr ""
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr ""
 
@@ -9122,7 +9194,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/nl.po b/po/nl.po
index 4f1c931cb..fa9f6137f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -8987,15 +8987,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "(?) aanval"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "(?) aanval"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9017,15 +9017,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "M.Verdediging"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "M.Verdediging"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9041,15 +9041,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "M.Verdediging"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "M.Verdediging"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 4f1c931cb..fa9f6137f 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: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -8987,15 +8987,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "(?) aanval"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "(?) aanval"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9017,15 +9017,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "M.Verdediging"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "M.Verdediging"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9041,15 +9041,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "M.Verdediging"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "M.Verdediging"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
diff --git a/po/pl.po b/po/pl.po
index 81457133a..ef771b798 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: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
 "pl/)\n"
@@ -9003,15 +9003,15 @@ msgstr "Atak %s"
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "Atak magią %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "Atak magią %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9033,15 +9033,15 @@ msgstr "Obrona %s"
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "Obrona magiczna %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "Obrona magiczna %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9057,15 +9057,15 @@ msgstr "Obrona magiczna %s"
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "Obrona magiczna %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "Obrona magiczna %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
@@ -9075,9 +9075,9 @@ msgstr "PŻ %s"
 
 #. TRANSLATORS: item info label (max health)
 #: src/resources/db/itemdb.cpp:123
-#, fuzzy, c-format
+#, c-format
 msgid "Max HP %s"
-msgstr "PŻ %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (mana)
 #: src/resources/db/itemdb.cpp:125
@@ -9087,9 +9087,9 @@ msgstr "PM %s"
 
 #. TRANSLATORS: item info label (max mana)
 #: src/resources/db/itemdb.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "Max MP %s"
-msgstr "PM %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (level)
 #: src/resources/db/itemdb.cpp:129
@@ -9117,15 +9117,15 @@ msgstr "Ominięcie %s"
 
 #. TRANSLATORS: item info label (min flee)
 #: src/resources/db/itemdb.cpp:137
-#, fuzzy, c-format
+#, c-format
 msgid "Min flee %s"
-msgstr "Ominięcie %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "Ominięcie %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
@@ -9262,9 +9262,9 @@ msgstr "Zostałeś/aś wykopany/a z gildii."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%s wyrzucił/a Cię z gildii."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/pt.po b/po/pt.po
index c42b85bed..bc84ac06b 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: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
 "pt/)\n"
@@ -8998,15 +8998,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "(?) Ataque"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "(?) Ataque"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9028,15 +9028,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "Def. Mágica"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "Max Membros: %d"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9052,15 +9052,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "Def. Mágica"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "Def. Mágica"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
@@ -9118,9 +9118,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "Max Membros: %d"
+msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
@@ -9257,9 +9257,9 @@ msgstr "Você foi expulso da guilda."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%s foi expulso(a) da Guilda."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8146cbcfa..be867c251 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -23,7 +23,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
 "language/pt_BR/)\n"
@@ -9015,15 +9015,15 @@ msgstr "Ataque %s"
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "Ataque M. %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "Ataque M. %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9045,15 +9045,15 @@ msgstr "Defesa %s"
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "Defesa M. %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "Defesa M. %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9069,15 +9069,15 @@ msgstr "Defesa M. %s"
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "Defesa M. %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "Defesa M. %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
@@ -9087,9 +9087,9 @@ msgstr "HP %s"
 
 #. TRANSLATORS: item info label (max health)
 #: src/resources/db/itemdb.cpp:123
-#, fuzzy, c-format
+#, c-format
 msgid "Max HP %s"
-msgstr "HP %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (mana)
 #: src/resources/db/itemdb.cpp:125
@@ -9099,9 +9099,9 @@ msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
 #: src/resources/db/itemdb.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "Max MP %s"
-msgstr "MP %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (level)
 #: src/resources/db/itemdb.cpp:129
@@ -9129,15 +9129,15 @@ msgstr "Evasão %s"
 
 #. TRANSLATORS: item info label (min flee)
 #: src/resources/db/itemdb.cpp:137
-#, fuzzy, c-format
+#, c-format
 msgid "Min flee %s"
-msgstr "Evasão %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "Evasão %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
@@ -9274,9 +9274,9 @@ msgstr "Você foi expulso da guilda."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%s foi expulso(a) da Guilda."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/ru.po b/po/ru.po
index 6c9b81609..0b2abc4df 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-04 13:13+0000\n"
+"PO-Revision-Date: 2015-08-15 11:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
 "ru/)\n"
@@ -9019,15 +9019,15 @@ msgstr "Атака %s"
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "Маг. атака %s"
+msgstr "Мин. атака %s"
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "Маг. атака %s"
+msgstr "Макс. атака %s"
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9049,15 +9049,15 @@ msgstr "Защита %s"
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "Маг. защита %s"
+msgstr "Мин. защита %s"
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "Маг. защита %s"
+msgstr "Макс. защита %s"
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9073,15 +9073,15 @@ msgstr "Маг. защита %s"
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "Маг. защита %s"
+msgstr "Мин. магическая защита %s"
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "Маг. защита %s"
+msgstr "Макс. магическая защита %s"
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
@@ -9091,9 +9091,9 @@ msgstr "Жизнь %s"
 
 #. TRANSLATORS: item info label (max health)
 #: src/resources/db/itemdb.cpp:123
-#, fuzzy, c-format
+#, c-format
 msgid "Max HP %s"
-msgstr "Жизнь %s"
+msgstr "Макс. здоровье %s"
 
 #. TRANSLATORS: item info label (mana)
 #: src/resources/db/itemdb.cpp:125
@@ -9103,9 +9103,9 @@ msgstr "Мана %s"
 
 #. TRANSLATORS: item info label (max mana)
 #: src/resources/db/itemdb.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "Max MP %s"
-msgstr "Мана %s"
+msgstr "Макс. мана %s"
 
 #. TRANSLATORS: item info label (level)
 #: src/resources/db/itemdb.cpp:129
@@ -9133,21 +9133,21 @@ msgstr "Уклонение %s"
 
 #. TRANSLATORS: item info label (min flee)
 #: src/resources/db/itemdb.cpp:137
-#, fuzzy, c-format
+#, c-format
 msgid "Min flee %s"
-msgstr "Уклонение %s"
+msgstr "Мин. уклонение %s"
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "Уклонение %s"
+msgstr "Макс. уклонение %s"
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
-#, fuzzy, c-format
+#, c-format
 msgid "Card slots %s"
-msgstr "Карты: "
+msgstr "Слоты %s"
 
 #. TRANSLATORS: item name
 #: src/resources/db/itemdb.cpp:240
@@ -9278,9 +9278,9 @@ msgstr "Вас выгнали из гильдии."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%s был вышвырнут из Вашей гильдии."
+msgstr "%s был кикнут из вашей гильдии."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/sk.po b/po/sk.po
index dc8a3af1a..4afab5c23 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Slovak (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr "Potvrdiť"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -402,53 +402,53 @@ msgstr[2] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -486,43 +486,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Nastavenie"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Nápoveda"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -534,9 +539,10 @@ msgstr "Nápoveda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -546,32 +552,32 @@ msgid "Close"
 msgstr "Zatvoriť"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -585,7 +591,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -594,48 +600,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -659,49 +795,49 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr ""
 
@@ -1096,32 +1232,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2134,8 +2270,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Použiť"
@@ -2806,7 +2942,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3870,12 +4006,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5661,8 +5797,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr ""
 
@@ -5744,12 +5880,12 @@ msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6506,24 +6642,24 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6884,25 +7020,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6910,7 +7046,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8045,136 +8181,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8394,34 +8400,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8799,32 +8805,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8918,7 +8924,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
@@ -8929,74 +8935,140 @@ msgstr ""
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr ""
 
@@ -9125,7 +9197,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/sq.po b/po/sq.po
index d2154e861..776231524 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Albanian (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -401,53 +401,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -485,43 +485,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -533,9 +538,10 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -545,32 +551,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -584,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -593,48 +599,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -658,49 +794,49 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr ""
 
@@ -1095,32 +1231,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2133,8 +2269,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
@@ -2805,7 +2941,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3869,12 +4005,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5660,8 +5796,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr ""
 
@@ -5743,12 +5879,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6503,24 +6639,24 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6881,25 +7017,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6907,7 +7043,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8042,136 +8178,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8391,34 +8397,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8796,32 +8802,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8915,7 +8921,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
@@ -8926,74 +8932,140 @@ msgstr ""
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr ""
 
@@ -9122,7 +9194,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/sv.po b/po/sv.po
index 6c695e5ec..e699717d9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
@@ -8994,15 +8994,15 @@ msgstr "Attack %s"
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "Attack %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "Attack %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9024,15 +9024,15 @@ msgstr "Defense %s"
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "Defense %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "Defense %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9048,15 +9048,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "Defense %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "Defense %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
@@ -9066,9 +9066,9 @@ msgstr "HP %s"
 
 #. TRANSLATORS: item info label (max health)
 #: src/resources/db/itemdb.cpp:123
-#, fuzzy, c-format
+#, c-format
 msgid "Max HP %s"
-msgstr "HP %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (mana)
 #: src/resources/db/itemdb.cpp:125
@@ -9078,9 +9078,9 @@ msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
 #: src/resources/db/itemdb.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "Max MP %s"
-msgstr "MP %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (level)
 #: src/resources/db/itemdb.cpp:129
@@ -9114,9 +9114,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "Maximalt antal medlemmar: %d"
+msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
@@ -9253,9 +9253,9 @@ msgstr "Du blev visst kickad från guilden."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%s har blivit kickad ur guilden."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 6c695e5ec..e699717d9 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: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
@@ -8994,15 +8994,15 @@ msgstr "Attack %s"
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "Attack %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "Attack %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9024,15 +9024,15 @@ msgstr "Defense %s"
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "Defense %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "Defense %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9048,15 +9048,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "Defense %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "Defense %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
@@ -9066,9 +9066,9 @@ msgstr "HP %s"
 
 #. TRANSLATORS: item info label (max health)
 #: src/resources/db/itemdb.cpp:123
-#, fuzzy, c-format
+#, c-format
 msgid "Max HP %s"
-msgstr "HP %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (mana)
 #: src/resources/db/itemdb.cpp:125
@@ -9078,9 +9078,9 @@ msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
 #: src/resources/db/itemdb.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "Max MP %s"
-msgstr "MP %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (level)
 #: src/resources/db/itemdb.cpp:129
@@ -9114,9 +9114,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "Maximalt antal medlemmar: %d"
+msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
@@ -9253,9 +9253,9 @@ msgstr "Du blev visst kickad från guilden."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%s har blivit kickad ur guilden."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/te.po b/po/te.po
index 023257870..5f6a713e2 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Telugu (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr "సరే"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -401,53 +401,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -485,43 +485,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "సహాయం"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -533,9 +538,10 @@ msgstr "సహాయం"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -545,32 +551,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -584,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -593,48 +599,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr "పొరపాటు"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -658,49 +794,49 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr "సాధారణ"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr ""
 
@@ -1095,32 +1231,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2133,8 +2269,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
@@ -2805,7 +2941,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3869,12 +4005,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5660,8 +5796,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr ""
 
@@ -5743,12 +5879,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6503,24 +6639,24 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6881,25 +7017,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6907,7 +7043,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8042,136 +8178,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8391,34 +8397,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8796,32 +8802,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8915,7 +8921,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
@@ -8926,74 +8932,140 @@ msgstr ""
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr ""
 
@@ -9122,7 +9194,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/th.po b/po/th.po
index 4161c2e76..13d52d31e 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Thai (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -400,53 +400,53 @@ msgstr[0] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -484,43 +484,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "ตั้งค่า"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -532,9 +537,10 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -544,32 +550,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -583,7 +589,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -592,48 +598,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr "ผิดพลาด"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -657,49 +793,49 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr ""
 
@@ -1094,32 +1230,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2132,8 +2268,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "ใช้"
@@ -2804,7 +2940,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3868,12 +4004,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5659,8 +5795,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr ""
 
@@ -5742,12 +5878,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6500,24 +6636,24 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6878,25 +7014,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6904,7 +7040,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8039,136 +8175,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8388,34 +8394,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8793,32 +8799,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8912,7 +8918,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
@@ -8923,74 +8929,140 @@ msgstr ""
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr ""
 
@@ -9119,7 +9191,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/tr.po b/po/tr.po
index b945200f5..6c50e9517 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: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
 "tr/)\n"
@@ -8981,15 +8981,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "(?) saldırı"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "(?) saldırı"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
diff --git a/po/uk.po b/po/uk.po
index 79fffd105..d6efa7417 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
 "uk/)\n"
@@ -8996,15 +8996,15 @@ msgstr "Атака %s"
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "Магічна атака %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "Магічна атака %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9026,15 +9026,15 @@ msgstr "Захист %s"
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:109
-#, fuzzy, c-format
+#, c-format
 msgid "Min defense %s"
-msgstr "Магічний захист %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "Магічний захист %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9050,15 +9050,15 @@ msgstr "Магічний захист %s"
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Min M. Defense %s"
-msgstr "Магічний захист %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
 #: src/resources/db/itemdb.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "Max M. Defense %s"
-msgstr "Магічний захист %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:121
@@ -9068,9 +9068,9 @@ msgstr "Здоров'я %s"
 
 #. TRANSLATORS: item info label (max health)
 #: src/resources/db/itemdb.cpp:123
-#, fuzzy, c-format
+#, c-format
 msgid "Max HP %s"
-msgstr "Здоров'я %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (mana)
 #: src/resources/db/itemdb.cpp:125
@@ -9080,9 +9080,9 @@ msgstr "Мана %s"
 
 #. TRANSLATORS: item info label (max mana)
 #: src/resources/db/itemdb.cpp:127
-#, fuzzy, c-format
+#, c-format
 msgid "Max MP %s"
-msgstr "Мана %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (level)
 #: src/resources/db/itemdb.cpp:129
@@ -9110,15 +9110,15 @@ msgstr "Ухилення %s"
 
 #. TRANSLATORS: item info label (min flee)
 #: src/resources/db/itemdb.cpp:137
-#, fuzzy, c-format
+#, c-format
 msgid "Min flee %s"
-msgstr "Ухилення %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "Ухилення %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
@@ -9255,9 +9255,9 @@ msgstr "Вас виштовхали з гільдії."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%s виштовхав вас з гільдії."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/vls.po b/po/vls.po
index e9fb09cef..ae7322973 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Vlaams (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -31,9 +31,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -51,126 +51,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -178,115 +178,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -306,92 +306,92 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -400,53 +400,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -484,43 +484,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -532,9 +537,10 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -544,32 +550,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -583,7 +589,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -592,48 +598,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -657,49 +793,49 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr ""
 
@@ -1094,32 +1230,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2132,8 +2268,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
@@ -2804,7 +2940,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3868,12 +4004,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5659,8 +5795,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr ""
 
@@ -5742,12 +5878,12 @@ msgid "Whispering to %s: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6502,24 +6638,24 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6880,25 +7016,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6906,7 +7042,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8041,136 +8177,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8390,34 +8396,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8795,32 +8801,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8914,7 +8920,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
@@ -8925,74 +8931,140 @@ msgstr ""
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr ""
 
@@ -9121,7 +9193,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 04258b563..e9749efe2 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: 2015-08-14 22:58+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_CN/)\n"
@@ -8976,15 +8976,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
-#, fuzzy, c-format
+#, c-format
 msgid "Min attack %s"
-msgstr "(?) 攻击"
+msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
 #: src/resources/db/itemdb.cpp:101
-#, fuzzy, c-format
+#, c-format
 msgid "Max attack %s"
-msgstr "(?) 攻击"
+msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:103
@@ -9012,9 +9012,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
 #: src/resources/db/itemdb.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Max defense %s"
-msgstr "最大成员: %d"
+msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
 #: src/resources/db/itemdb.cpp:113
@@ -9096,9 +9096,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
 #: src/resources/db/itemdb.cpp:139
-#, fuzzy, c-format
+#, c-format
 msgid "Max flee %s"
-msgstr "最大成员: %d"
+msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
 #: src/resources/db/itemdb.cpp:141
@@ -9235,9 +9235,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been kicked from your guild."
-msgstr "%s已经被工会开除."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:134
diff --git a/po/zh_HK.po b/po/zh_HK.po
index d690f112d..49ccdf35d 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr "確定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -400,53 +400,53 @@ msgstr[0] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -484,43 +484,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "顯示"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "說明"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -532,9 +537,10 @@ msgstr "說明"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -544,32 +550,32 @@ msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -583,7 +589,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -592,48 +598,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -657,49 +793,49 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr ""
 
@@ -1094,32 +1230,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2132,8 +2268,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
@@ -2804,7 +2940,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3868,12 +4004,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "啟用搖桿"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5659,8 +5795,8 @@ msgstr "開始"
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr ""
 
@@ -5742,12 +5878,12 @@ msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6500,24 +6636,24 @@ msgid "Up"
 msgstr "升級"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6878,25 +7014,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6904,7 +7040,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8039,136 +8175,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8388,34 +8394,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8793,32 +8799,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8912,7 +8918,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
@@ -8923,74 +8929,140 @@ msgstr ""
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr ""
 
@@ -9119,7 +9191,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
diff --git a/po/zh_TW.po b/po/zh_TW.po
index dcda84ba6..655d6e824 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: 2015-08-01 14:09+0300\n"
-"PO-Revision-Date: 2015-08-02 09:12+0000\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
+"PO-Revision-Date: 2015-08-15 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/akaras/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:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr ""
 
@@ -32,9 +32,9 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:158 src/client.cpp:1453 src/client.cpp:1486
-#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
-#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:161 src/client.cpp:1475 src/client.cpp:1509
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
 #: src/gui/widgets/tabs/setup_video.cpp:250
@@ -52,126 +52,126 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:612
-#: src/net/eathena/charserverhandler.cpp:647
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:506
+#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:649
+#: src/net/eathena/charserverhandler.cpp:685
+#: src/net/tmwa/charserverhandler.cpp:476
 msgid "OK"
 msgstr "確定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
+#: src/actions/actions.cpp:1008 src/actions/actions.cpp:1021
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
+#: src/actions/actions.cpp:1159 src/actions/actions.cpp:1216
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1349
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1474
+#: src/actions/actions.cpp:1505
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1483
+#: src/actions/actions.cpp:1514
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1492
+#: src/actions/actions.cpp:1523
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:246
+#: src/actions/chat.cpp:256
 msgid "Cannot send empty whispers!"
 msgstr "傳送密語失敗!"
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:294
+#: src/actions/chat.cpp:305
 #, 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:319 src/gui/widgets/tabs/chat/partytab.cpp:71
+#: src/actions/chat.cpp:330 src/gui/widgets/tabs/chat/partytab.cpp:71
 msgid "Party name is missing."
 msgstr "漏掉隊伍名稱."
 
 #. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:337
+#: src/actions/chat.cpp:353
 msgid "Guild name is missing."
 msgstr ""
 
@@ -179,115 +179,115 @@ msgstr ""
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:358 src/actions/chat.cpp:389 src/actions/chat.cpp:460
-#: src/actions/chat.cpp:490 src/actions/commands.cpp:80
+#: src/actions/chat.cpp:375 src/actions/chat.cpp:406 src/actions/chat.cpp:478
+#: src/actions/chat.cpp:513 src/actions/commands.cpp:82
 msgid "Please specify a name."
 msgstr ""
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Return toggles chat."
 msgstr "\"ENTER\"切換聊天."
 
-#: src/actions/chat.cpp:409
+#: src/actions/chat.cpp:426
 msgid "Message closes chat."
 msgstr "關閉密語."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:421
+#: src/actions/chat.cpp:438
 msgid "Return now toggles chat."
 msgstr "\"ENTER\"切換聊天."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:431
+#: src/actions/chat.cpp:448
 msgid "Message now closes chat."
 msgstr "切換聊天."
 
-#: src/actions/chat.cpp:575
+#: src/actions/chat.cpp:598
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:168
+#: src/actions/commands.cpp:175
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:177
+#: src/actions/commands.cpp:184
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:186
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:201
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:207
+#: src/actions/commands.cpp:214
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:216
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:216
+#: src/actions/commands.cpp:223
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:230
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:237
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:244
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:251
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:948
+#: src/actions/commands.cpp:1012
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -307,92 +307,92 @@ msgid "Accepting incoming trade requests"
 msgstr "接受收到的交易要求"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1376
+#: src/actormanager.cpp:1381
 msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:440
+#: src/being/being.cpp:448
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:614
+#: src/being/being.cpp:625
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2121 src/gui/windows/whoisonline.cpp:871
+#: src/being/being.cpp:2134 src/gui/windows/whoisonline.cpp:871
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2126 src/gui/windows/whoisonline.cpp:876
+#: src/being/being.cpp:2139 src/gui/windows/whoisonline.cpp:876
 msgid "I"
 msgstr ""
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:380
+#: src/being/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:852
+#: src/being/localplayer.cpp:853
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:856
+#: src/being/localplayer.cpp:857
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:860
+#: src/being/localplayer.cpp:861
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:864
+#: src/being/localplayer.cpp:865
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:871
+#: src/being/localplayer.cpp:872
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:896
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -400,53 +400,53 @@ msgstr[0] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1067 src/being/localplayer.cpp:1068
-#: src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1068 src/being/localplayer.cpp:1069
+#: src/being/localplayer.cpp:1095
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1078
-#: src/being/localplayer.cpp:1084
+#: src/being/localplayer.cpp:1073 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1085
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1103
+#: src/being/localplayer.cpp:1104
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1112
+#: src/being/localplayer.cpp:1113
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2186
+#: src/being/localplayer.cpp:2187
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2192 src/being/localplayer.cpp:2217
+#: src/being/localplayer.cpp:2193 src/being/localplayer.cpp:2218
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:2203
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2208 src/being/localplayer.cpp:2222
+#: src/being/localplayer.cpp:2209 src/being/localplayer.cpp:2223
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2572
+#: src/being/localplayer.cpp:2573
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -484,43 +484,48 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/gui/windowmenu.cpp:177
+#: src/client.cpp:810 src/dyetool/client.cpp:470 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:808 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:813 src/dyetool/client.cpp:473
+#: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:811 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:816 src/dyetool/client.cpp:476
+#: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "顯示"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:814 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:819 src/dyetool/client.cpp:479
+#: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:817
+#: src/client.cpp:822 src/dyetool/client.cpp:482
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:820 src/gui/windowmenu.cpp:72
+#: src/client.cpp:825 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "說明"
 
 #. TRANSLATORS: close quick button
 #. TRANSLATORS: ok dialog button
+#. TRANSLATORS: close quick button
+#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: close chat tab
 #. TRANSLATORS: popup menu item
@@ -532,9 +537,10 @@ msgstr "說明"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:824 src/client.cpp:1371 src/client.cpp:1390
-#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
-#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:829 src/client.cpp:1389 src/client.cpp:1408
+#: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
+#: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
+#: src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
 #: src/gui/windows/inventorywindow.cpp:289
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
@@ -544,32 +550,32 @@ msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1041 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1048 src/gui/windowmanager_unittest.cc:145
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1087 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1094 src/gui/windowmanager_unittest.cc:162
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1130
+#: src/client.cpp:1143
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1263
+#: src/client.cpp:1278
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1302
+#: src/client.cpp:1318
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1330
 msgid "Changing game servers"
 msgstr ""
 
@@ -583,7 +589,7 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1368 src/client.cpp:1387 src/client.cpp:1598
+#: src/client.cpp:1386 src/client.cpp:1405 src/client.cpp:1635
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:386
@@ -592,48 +598,178 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:241
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:587
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:679
-#: src/net/tmwa/charserverhandler.cpp:502
+#: src/net/eathena/charserverhandler.cpp:589
+#: src/net/eathena/charserverhandler.cpp:593
+#: src/net/eathena/charserverhandler.cpp:681
+#: src/net/tmwa/charserverhandler.cpp:472
 msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1406
+#: src/client.cpp:1424
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1449
+#: src/client.cpp:1471
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1451
+#: src/client.cpp:1473
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1482
+#: src/client.cpp:1505
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1514
+#: src/client.cpp:1541
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1516
+#: src/client.cpp:1543
 msgid "Farewell, come back any time..."
 msgstr ""
 
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:42
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:44
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:47
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:49
+msgid "                  to the manaplus client."
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:52
+msgid "Options:"
+msgstr "選項:"
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:54
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:56
+msgid "  -a --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:58
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:60
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:62
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:65
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:67
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:71
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:73
+msgid "  -y --server-type    : Login server type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:75
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:77
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:79
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:82
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:84
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:87
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:90
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:93
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:95
+msgid "     --renderer       : Set renderer type"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:97
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#. TRANSLATORS: command line help
+#: src/commandline.cpp:101
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:352 src/dirs.cpp:367 src/dirs.cpp:412
 #: src/dirs.cpp:580 src/dirs.cpp:588
@@ -657,49 +793,49 @@ msgstr "建立更新目錄失敗!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:48
+#: src/dyetool/dyemain.cpp:47
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:49
+#: src/dyetool/dyemain.cpp:48
 msgid "or"
 msgstr ""
 
-#: src/dyetool/dyemain.cpp:50
+#: src/dyetool/dyemain.cpp:49
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2184
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2189
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:259 src/gui/windowmenu.cpp:163
+#: src/game.cpp:260 src/gui/windowmenu.cpp:163
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:556
+#: src/game.cpp:559
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:566
+#: src/game.cpp:569
 msgid "Saving screenshot failed!"
 msgstr "儲存抓圖失敗!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:651
+#: src/game.cpp:654
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:654
+#: src/game.cpp:657
 msgid "Network Error"
 msgstr "網路錯誤"
 
@@ -1094,32 +1230,32 @@ msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:119
+#: src/gui/dialogsmanager.cpp:130
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:133 src/gui/dialogsmanager.cpp:162
-#: src/gui/dialogsmanager.cpp:182
+#: src/gui/dialogsmanager.cpp:145 src/gui/dialogsmanager.cpp:176
+#: src/gui/dialogsmanager.cpp:196
 msgid "Message"
 msgstr ""
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:136 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2636
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:178
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:184
+#: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -2132,8 +2268,8 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:1779 src/gui/popups/popupmenu.cpp:2579
 #: src/gui/windows/inventorywindow.cpp:198
 #: src/gui/windows/inventorywindow.cpp:771 src/gui/windows/skilldialog.cpp:77
-#: src/gui/windows/skilldialog.cpp:149 src/gui/windows/skilldialog.cpp:319
-#: src/gui/windows/skilldialog.cpp:483 src/gui/windows/skilldialog.cpp:565
+#: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
+#: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
@@ -2804,7 +2940,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:479
+#: src/gui/widgets/skillinfo.cpp:95 src/gui/windows/skilldialog.cpp:481
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3868,12 +4004,12 @@ msgid "Detect joysticks"
 msgstr ""
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:56
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
 msgid "Enable joystick"
 msgstr "啟用搖桿"
 
 #. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:59
 msgid "Use joystick if client window inactive"
 msgstr ""
 
@@ -5659,8 +5795,8 @@ msgstr "開始"
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:79
 #: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:608
-#: src/net/eathena/charserverhandler.cpp:644
+#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:646
 msgid "Info"
 msgstr "資訊"
 
@@ -5742,12 +5878,12 @@ msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
 
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1565
+#: src/gui/windows/chatwindow.cpp:1570
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1750 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6500,24 +6636,24 @@ msgid "Up"
 msgstr "升級"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
@@ -6878,25 +7014,25 @@ 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:376 src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:378 src/input/inputmanager.cpp:422
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:382
+#: src/input/inputmanager.cpp:384
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:396
+#: src/input/inputmanager.cpp:398
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:426
+#: src/input/inputmanager.cpp:428
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6904,7 +7040,7 @@ msgstr ""
 #. 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:440 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:442 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8039,136 +8175,6 @@ msgstr ""
 msgid "Npc"
 msgstr ""
 
-#. TRANSLATORS: command line help
-#: src/main.cpp:82
-msgid "manaplus [options] [manaplus-file]"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:84
-msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:87
-msgid "                  used to set custom parameters"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:89
-msgid "                  to the manaplus client."
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:92
-msgid "Options:"
-msgstr "選項:"
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:94
-msgid "  -l --log-file       : Log file to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:96
-msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:98
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:100
-msgid "  -h --help           : Display this help"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:102
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:105
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:107
-msgid "  -P --password       : Login with this password"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:109
-msgid "  -c --character      : Login with this character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:111
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:113
-msgid "  -y --server-type    : Login server type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:115
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:117
-msgid "  -H --update-host    : Use this update host"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:119
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:122
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:124
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:127
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:130
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:133
-msgid "     --safemode       : Start game in safe mode"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:135
-msgid "     --renderer       : Set renderer type"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:137
-msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-
-#. TRANSLATORS: command line help
-#: src/main.cpp:141
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:87
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -8388,34 +8394,34 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:635
+#: src/net/eathena/charserverhandler.cpp:591
+#: src/net/eathena/charserverhandler.cpp:637
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:610
+#: src/net/eathena/charserverhandler.cpp:612
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:626
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:632
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:639
+#: src/net/eathena/charserverhandler.cpp:641
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:504
+#: src/net/eathena/charserverhandler.cpp:683
+#: src/net/tmwa/charserverhandler.cpp:474
 msgid "Failed to delete character."
 msgstr ""
 
@@ -8793,32 +8799,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s 請求交易, 是否接受?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:332
+#: src/net/tmwa/charserverhandler.cpp:307
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr ""
 
@@ -8912,7 +8918,7 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:356 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "未知物品"
@@ -8923,74 +8929,140 @@ msgstr "未知物品"
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
 #, c-format
+msgid "Min attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, c-format
+msgid "Max attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
+#, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, c-format
+msgid "Min defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, c-format
+msgid "Max defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, c-format
+msgid "Min M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, c-format
+msgid "Max M. Defense %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, c-format
+msgid "Max HP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, c-format
+msgid "Max MP %s"
+msgstr ""
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:117
+#. TRANSLATORS: item info label (attack range)
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Range %s"
 msgstr ""
 
-#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:119
+#. TRANSLATORS: item info label (flee)
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, c-format
+msgid "Min flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, c-format
+msgid "Max flee %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, c-format
+msgid "Card slots %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:218
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr "不明的物品"
 
@@ -9119,7 +9191,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
 #, c-format
-msgid "%s has kicked from your guild."
+msgid "%s has been kicked from your guild."
 msgstr ""
 
 #. TRANSLATORS: notification message