Update translations.

1 files changed, 403 insertions, 341 deletions

diff --git a/po/ru.po b/po/ru.po
index e6bc3e2b5..3ecdb54a3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-08-29 20:44+0300\n"
-"PO-Revision-Date: 2014-08-29 18:04+0000\n"
+"POT-Creation-Date: 2014-09-09 20:33+0300\n"
+"PO-Revision-Date: 2014-08-30 13:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
 "language/ru/)\n"
@@ -42,7 +42,7 @@ msgstr "Файл выгружен"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1454 src/client.cpp:1481
+#: src/actions/actions.cpp:131 src/client.cpp:1455 src/client.cpp:1482
 #: src/gamemodifiers.cpp:422 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -53,110 +53,110 @@ msgstr "Файл выгружен"
 #: src/gui/windows/changeemaildialog.cpp:173
 #: src/gui/windows/changepassworddialog.cpp:163
 #: src/gui/windows/charcreatedialog.cpp:374
-#: src/gui/windows/charselectdialog.cpp:247
-#: src/gui/windows/charselectdialog.cpp:283 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:293 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:201
 #: src/gui/windows/itemamountwindow.cpp:159 src/gui/windows/quitdialog.cpp:71
 #: src/gui/windows/registerdialog.cpp:249 src/gui/windows/socialwindow.cpp:502
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:152
-#: src/net/ea/charserverhandler.cpp:208 src/net/ea/charserverhandler.cpp:227
-#: src/net/ea/charserverhandler.cpp:240 src/net/ea/gamehandler.cpp:98
-#: src/net/ea/playerhandler.cpp:279 src/net/ea/playerhandler.cpp:295
+#: src/net/ea/charserverhandler.cpp:203 src/net/ea/charserverhandler.cpp:222
+#: src/net/ea/charserverhandler.cpp:235 src/net/ea/gamehandler.cpp:79
+#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
 msgid "OK"
 msgstr "ОК"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:645 src/actions/actions.cpp:657
+#: src/actions/actions.cpp:663 src/actions/actions.cpp:675
 msgid "Cache cleaned"
 msgstr "Кеш очищен"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:785 src/actions/actions.cpp:841
+#: src/actions/actions.cpp:803 src/actions/actions.cpp:859
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d week"
 msgstr "%d неделя"
 
-#: src/actions/actions.cpp:796
+#: src/actions/actions.cpp:814
 #, c-format
 msgid "%d weeks"
 msgstr "%d недель"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d day"
 msgstr "%d день"
 
-#: src/actions/actions.cpp:807
+#: src/actions/actions.cpp:825
 #, c-format
 msgid "%d days"
 msgstr "%d дней"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hour"
 msgstr "%d час"
 
-#: src/actions/actions.cpp:817
+#: src/actions/actions.cpp:835
 #, c-format
 msgid "%d hours"
 msgstr "%d часов"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minute"
 msgstr "%d минута"
 
-#: src/actions/actions.cpp:827
+#: src/actions/actions.cpp:845
 #, c-format
 msgid "%d minutes"
 msgstr "%d минут"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d second"
 msgstr "%d секунда"
 
-#: src/actions/actions.cpp:837
+#: src/actions/actions.cpp:855
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:898 src/actions/actions.cpp:907
+#: src/actions/actions.cpp:916 src/actions/actions.cpp:925
 msgid "Resource images:"
 msgstr "Изображений:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:901 src/actions/actions.cpp:910
+#: src/actions/actions.cpp:919 src/actions/actions.cpp:928
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:998
+#: src/actions/actions.cpp:1016
 msgid "Environment variables dumped"
 msgstr "Переменные среды сохранены"
 
-#: src/actions/actions.cpp:1117
+#: src/actions/actions.cpp:1135
 msgid "Uploaded config into:"
 msgstr "Информация о выгруженном конфиге:"
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1144
 msgid "Uploaded server config into:"
 msgstr "Информация о выгруженном конфиге сервера:"
 
-#: src/actions/actions.cpp:1135
+#: src/actions/actions.cpp:1153
 msgid "Uploaded log into:"
 msgstr "Информация о выгруженном логе:"
 
@@ -312,12 +312,12 @@ msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1826 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1831 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "Б"
 
@@ -420,8 +420,8 @@ msgstr "Вы видите %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2595
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2644
 msgid "Completely ignore"
 msgstr "Полностью игнорировать"
 
@@ -494,9 +494,9 @@ msgstr "Помощь"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:934 src/client.cpp:1382 src/client.cpp:1396
-#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:632
-#: src/gui/popups/popupmenu.cpp:883 src/gui/windows/didyouknowwindow.cpp:81
+#: src/client.cpp:934 src/client.cpp:1383 src/client.cpp:1397
+#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:895 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:75
 #: src/gui/windows/npcdialog.cpp:113 src/gui/windows/questswindow.cpp:77
 #: src/gui/windows/shopwindow.cpp:85
@@ -504,32 +504,32 @@ msgid "Close"
 msgstr "Закрыть"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1058
+#: src/client.cpp:1059
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1106
+#: src/client.cpp:1107
 msgid "Logging in"
 msgstr "Авторизация"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1274
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1313
+#: src/client.cpp:1314
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1326
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
@@ -543,50 +543,50 @@ msgstr "Смена игрового сервера"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1380 src/client.cpp:1394 src/client.cpp:1589
+#: src/client.cpp:1381 src/client.cpp:1395 src/client.cpp:1590
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:370
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 #: src/gui/windows/editserverdialog.cpp:196
 #: src/gui/windows/registerdialog.cpp:249
 #: src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:206 src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:201 src/net/ea/charserverhandler.cpp:233
 msgid "Error"
 msgstr "Ошибка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1409
+#: src/client.cpp:1410
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1450
+#: src/client.cpp:1451
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1452
+#: src/client.cpp:1453
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1477
+#: src/client.cpp:1478
 msgid "Email Change"
 msgstr "Сменить Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1479
+#: src/client.cpp:1480
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1506
+#: src/client.cpp:1507
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1508
+#: src/client.cpp:1509
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
@@ -1206,8 +1206,8 @@ msgstr "Огромный (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/popups/popupmenu.cpp:2371 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2305
+#: src/gui/popups/popupmenu.cpp:2383 src/gui/widgets/tabs/socialtabbase.h:48
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1481,20 +1481,20 @@ msgstr "Создать группу"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:315
-#: src/gui/popups/popupmenu.cpp:350 src/gui/popups/popupmenu.cpp:448
-#: src/gui/popups/popupmenu.cpp:495 src/gui/popups/popupmenu.cpp:530
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:586
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:812
-#: src/gui/popups/popupmenu.cpp:839 src/gui/popups/popupmenu.cpp:872
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2071
-#: src/gui/popups/popupmenu.cpp:2121 src/gui/popups/popupmenu.cpp:2163
-#: src/gui/popups/popupmenu.cpp:2204 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2350 src/gui/popups/popupmenu.cpp:2384
-#: src/gui/popups/popupmenu.cpp:2410 src/gui/popups/popupmenu.cpp:2432
-#: src/gui/popups/popupmenu.cpp:2455 src/gui/popups/popupmenu.cpp:2482
-#: src/gui/popups/popupmenu.cpp:2499 src/gui/popups/popupmenu.cpp:2770
-#: src/gui/popups/popupmenu.cpp:2896 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/popups/createpartypopup.h:54 src/gui/popups/popupmenu.cpp:316
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:460
+#: src/gui/popups/popupmenu.cpp:507 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
+#: src/gui/popups/popupmenu.cpp:623 src/gui/popups/popupmenu.cpp:824
+#: src/gui/popups/popupmenu.cpp:851 src/gui/popups/popupmenu.cpp:884
+#: src/gui/popups/popupmenu.cpp:2047 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2133 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2216 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2362 src/gui/popups/popupmenu.cpp:2396
+#: src/gui/popups/popupmenu.cpp:2422 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2464 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2777
+#: src/gui/popups/popupmenu.cpp:2903 src/gui/windows/buyselldialog.cpp:76
 #: src/gui/windows/changeemaildialog.cpp:59
 #: src/gui/windows/changepassworddialog.cpp:61
 #: src/gui/windows/charcreatedialog.cpp:130
@@ -1518,7 +1518,7 @@ msgstr "Вес: %s"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:160 src/gui/popups/popupmenu.cpp:705
+#: src/gui/popups/popupmenu.cpp:161 src/gui/popups/popupmenu.cpp:717
 #: src/gui/widgets/tabs/tradetab.cpp:37
 msgid "Trade"
 msgstr "Торговать"
@@ -1532,49 +1532,49 @@ msgstr "Торговать"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:267
-#: src/gui/popups/popupmenu.cpp:708 src/gui/windows/botcheckerwindow.cpp:89
-#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:257
-#: src/net/tmwa/generalhandler.cpp:295
+#: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:268
+#: src/gui/popups/popupmenu.cpp:720 src/gui/windows/botcheckerwindow.cpp:89
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:297
 msgid "Attack"
 msgstr "Атака"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:373
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:385
 msgid "Whisper"
 msgstr "Приват"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:724
 msgid "Heal"
 msgstr "Лечить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:208
-#: src/gui/popups/popupmenu.cpp:419 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:193 src/gui/popups/popupmenu.cpp:209
+#: src/gui/popups/popupmenu.cpp:431 src/gui/popups/popupmenu.cpp:771
 msgid "Kick from guild"
 msgstr "Выкинуть из гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:426 src/gui/popups/popupmenu.cpp:766
+#: src/gui/popups/popupmenu.cpp:200 src/gui/popups/popupmenu.cpp:216
+#: src/gui/popups/popupmenu.cpp:438 src/gui/popups/popupmenu.cpp:778
 msgid "Change pos in guild"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:225 src/gui/popups/popupmenu.cpp:436
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:448
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Invite to guild"
 msgstr "Пригласить в гильдию"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:233
 msgid "Nuke"
 msgstr "Уничтожить"
 
@@ -1592,9 +1592,9 @@ msgstr "Уничтожить"
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: bot checker window table header
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:256
-#: src/gui/popups/popupmenu.cpp:403 src/gui/popups/popupmenu.cpp:554
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:236 src/gui/popups/popupmenu.cpp:257
+#: src/gui/popups/popupmenu.cpp:415 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:731 src/gui/popups/popupmenu.cpp:812
 #: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:93
 msgid "Move"
 msgstr "Движение"
@@ -1603,7 +1603,7 @@ msgstr "Движение"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:246 src/gui/windows/botcheckerwindow.cpp:91
+#: src/gui/popups/popupmenu.cpp:247 src/gui/windows/botcheckerwindow.cpp:91
 #: src/input/pages/basic.cpp:90
 msgid "Talk"
 msgstr "Разговор"
@@ -1614,7 +1614,7 @@ msgstr "Разговор"
 #. TRANSLATORS: buy item
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:249 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:2675
 #: src/gui/windows/buydialog.cpp:184 src/gui/windows/buydialog.cpp:200
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/buyselldialog.cpp:72
 msgid "Buy"
@@ -1627,7 +1627,7 @@ msgstr "Купить"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: sell dialog name
 #. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:2671
+#: src/gui/popups/popupmenu.cpp:253 src/gui/popups/popupmenu.cpp:2678
 #: src/gui/windows/buyselldialog.cpp:74 src/gui/windows/selldialog.cpp:60
 #: src/gui/windows/selldialog.cpp:74 src/gui/windows/selldialog.cpp:123
 msgid "Sell"
@@ -1637,26 +1637,26 @@ msgstr "Продать"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:259 src/gui/popups/popupmenu.cpp:383
-#: src/gui/popups/popupmenu.cpp:2732
+#: src/gui/popups/popupmenu.cpp:260 src/gui/popups/popupmenu.cpp:395
+#: src/gui/popups/popupmenu.cpp:2739
 msgid "Add comment"
 msgstr "Добавить комментарий"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:279
+#: src/gui/popups/popupmenu.cpp:280
 msgid "Remove from attack list"
 msgstr "Удалить из списка атаки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:287
 msgid "Add to priority attack list"
 msgstr "Добавить в приоритетный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:291
 msgid "Add to attack list"
 msgstr "Добавить в список атаки"
 
@@ -1664,7 +1664,7 @@ msgstr "Добавить в список атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:294 src/gui/popups/popupmenu.cpp:2752
+#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:2759
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
@@ -1672,44 +1672,44 @@ msgstr "Добавить в список игнорирования"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:310 src/gui/popups/popupmenu.cpp:444
+#: src/gui/popups/popupmenu.cpp:311 src/gui/popups/popupmenu.cpp:456
 msgid "Add name to chat"
 msgstr "Добавить имя в чат"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:327 src/gui/widgets/tabs/setup_players.cpp:38
+#: src/gui/popups/popupmenu.cpp:341 src/gui/widgets/tabs/setup_players.cpp:38
 msgid "Players"
 msgstr "Игроки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:740
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:407 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:2723
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:477 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:489 src/gui/popups/popupmenu.cpp:498
 msgid "Pick up"
 msgstr "Поднять"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:491 src/gui/popups/popupmenu.cpp:2031
-#: src/gui/popups/popupmenu.cpp:2107 src/gui/popups/popupmenu.cpp:2149
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2043
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2161
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:544
+#: src/gui/popups/popupmenu.cpp:524 src/gui/popups/popupmenu.cpp:556
 msgid "Map Item"
 msgstr "Элемент карты"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:515
+#: src/gui/popups/popupmenu.cpp:527
 msgid "Rename"
 msgstr "Переименовать"
 
@@ -1719,20 +1719,20 @@ msgstr "Переименовать"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:518 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2380
+#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:2358
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Remove"
 msgstr "Удалить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:525 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:562
 msgid "Warp"
 msgstr "Прыгнуть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:569
 msgid "Move camera"
 msgstr "Передвинуть камеру"
 
@@ -1741,7 +1741,7 @@ msgstr "Передвинуть камеру"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:575 src/gui/setupinputpages.cpp:53
+#: src/gui/popups/popupmenu.cpp:587 src/gui/setupinputpages.cpp:53
 #: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -1749,69 +1749,69 @@ msgstr "Наряды"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:578
+#: src/gui/popups/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr "Очистить наряд"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:604 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:616 src/gui/windowmenu.cpp:125
 msgid "Spells"
 msgstr "Заклинания"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:607
+#: src/gui/popups/popupmenu.cpp:619
 msgid "Edit spell"
 msgstr "Изменить заклинание"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:637 src/gui/windows/npcdialog.cpp:110
+#: src/gui/popups/popupmenu.cpp:649 src/gui/windows/npcdialog.cpp:110
 msgid "Clear"
 msgstr "Очистить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:656
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:650
+#: src/gui/popups/popupmenu.cpp:662
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:656
+#: src/gui/popups/popupmenu.cpp:668
 msgid "Don't remove name"
 msgstr "Не скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:662
+#: src/gui/popups/popupmenu.cpp:674
 msgid "Remove name"
 msgstr "Скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:668
+#: src/gui/popups/popupmenu.cpp:680
 msgid "Enable away"
 msgstr "Разрешить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:686
 msgid "Disable away"
 msgstr "Запретить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:681 src/gui/windows/socialwindow.cpp:89
+#: src/gui/popups/popupmenu.cpp:693 src/gui/windows/socialwindow.cpp:89
 msgid "Leave"
 msgstr "Покинуть"
 
@@ -1821,85 +1821,85 @@ msgstr "Покинуть"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:2451
-#: src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2502
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:733 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:745 src/gui/popups/popupmenu.cpp:2717
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:821
+#: src/gui/popups/popupmenu.cpp:833
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:878
 msgid "window"
 msgstr "окно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:892
+#: src/gui/popups/popupmenu.cpp:904
 msgid "Unlock"
 msgstr "Разблокировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:898
+#: src/gui/popups/popupmenu.cpp:910
 msgid "Lock"
 msgstr "Заблокировать"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1393
+#: src/gui/popups/popupmenu.cpp:1405
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1395
+#: src/gui/popups/popupmenu.cpp:1407
 msgid "Name:                    "
 msgstr "Имя:                     "
 
-#: src/gui/popups/popupmenu.cpp:1419
+#: src/gui/popups/popupmenu.cpp:1431
 msgid "Player comment            "
 msgstr "Комментарий игрока        "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1421
+#: src/gui/popups/popupmenu.cpp:1433
 msgid "Comment:                      "
 msgstr "Комментарий:                  "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1948
+#: src/gui/popups/popupmenu.cpp:1960
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1955
+#: src/gui/popups/popupmenu.cpp:1967
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:1971
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1962
+#: src/gui/popups/popupmenu.cpp:1974
 msgid "Add to trade all-1"
 msgstr "Добавить к торговле все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1977
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
@@ -1908,64 +1908,64 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1973 src/gui/popups/popupmenu.cpp:2103
-#: src/gui/popups/popupmenu.cpp:2144 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2115
+#: src/gui/popups/popupmenu.cpp:2156 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Сохранить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1980
+#: src/gui/popups/popupmenu.cpp:1992
 msgid "Store 10"
 msgstr "Сохранить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1984
+#: src/gui/popups/popupmenu.cpp:1996
 msgid "Store half"
 msgstr "Сохранить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1987
+#: src/gui/popups/popupmenu.cpp:1999
 msgid "Store all-1"
 msgstr "Сохранить все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1990
+#: src/gui/popups/popupmenu.cpp:2002
 msgid "Store all"
 msgstr "Сохранить все"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:2014 src/gui/windows/inventorywindow.cpp:225
 msgid "Retrieve"
 msgstr "Получить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:2013
+#: src/gui/popups/popupmenu.cpp:2025
 msgid "Retrieve half"
 msgstr "Получить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:2016
+#: src/gui/popups/popupmenu.cpp:2028
 msgid "Retrieve all-1"
 msgstr "Забрать все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2031
 msgid "Retrieve all"
 msgstr "Получить все"
 
@@ -1975,51 +1975,51 @@ msgstr "Получить все"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/popups/popupmenu.cpp:2820
+#: src/gui/popups/popupmenu.cpp:2077 src/gui/popups/popupmenu.cpp:2827
 #: src/gui/windows/inventorywindow.cpp:174
 #: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:68
-#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
-#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
-#: src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:282
+#: src/gui/windows/skilldialog.cpp:406 src/gui/windows/skilldialog.cpp:464
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Использовать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Clear drop window"
 msgstr "Очистить окно дропов"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2251
+#: src/gui/popups/popupmenu.cpp:2202 src/gui/popups/popupmenu.cpp:2263
 msgid "Hide"
 msgstr "Спрятать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2197 src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2209 src/gui/popups/popupmenu.cpp:2270
 msgid "Show"
 msgstr "Показать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:2277
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:2281 src/gui/windows/statuswindow.cpp:94
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2309 src/gui/popups/popupmenu.cpp:2328
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2340
 msgid "Move up"
 msgstr "Передвинуть выше"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2315 src/gui/popups/popupmenu.cpp:2334
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2346
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -2027,144 +2027,144 @@ msgstr "Передвинуть ниже"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2729
+#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2736
 msgid "Undress"
 msgstr "Раздеть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2425
+#: src/gui/popups/popupmenu.cpp:2436
 msgid "Copy"
 msgstr "Копировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2428
+#: src/gui/popups/popupmenu.cpp:2439
 msgid "Paste"
 msgstr "Вставить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2448
+#: src/gui/popups/popupmenu.cpp:2457
 msgid "Open link"
 msgstr "Открыть ссылку"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2468
+#: src/gui/popups/popupmenu.cpp:2475
 msgid "Show window"
 msgstr "Показать окно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2577
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2548 src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2623 src/gui/popups/popupmenu.cpp:2641
 msgid "Disregard"
 msgstr "Пренебречь"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2544 src/gui/popups/popupmenu.cpp:2580
-#: src/gui/popups/popupmenu.cpp:2619 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2551 src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2626 src/gui/windows/confirmdialog.cpp:60
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2547 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2554 src/gui/popups/popupmenu.cpp:2629
 msgid "Black list"
 msgstr "Черный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2550 src/gui/popups/popupmenu.cpp:2583
+#: src/gui/popups/popupmenu.cpp:2557 src/gui/popups/popupmenu.cpp:2590
 msgid "Set as enemy"
 msgstr "Сделать врагом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2586
-#: src/gui/popups/popupmenu.cpp:2598 src/gui/popups/popupmenu.cpp:2607
-#: src/gui/popups/popupmenu.cpp:2625
+#: src/gui/popups/popupmenu.cpp:2560 src/gui/popups/popupmenu.cpp:2593
+#: src/gui/popups/popupmenu.cpp:2605 src/gui/popups/popupmenu.cpp:2614
+#: src/gui/popups/popupmenu.cpp:2632
 msgid "Erase"
 msgstr "Стереть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Be friend"
 msgstr "Подружиться"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2574 src/gui/popups/popupmenu.cpp:2592
-#: src/gui/popups/popupmenu.cpp:2604 src/gui/popups/popupmenu.cpp:2613
-#: src/gui/popups/popupmenu.cpp:2631
+#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2620
+#: src/gui/popups/popupmenu.cpp:2638
 msgid "Unignore"
 msgstr "Не игнорировать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2657
 msgid "Follow"
 msgstr "Следовать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2661
 msgid "Imitation"
 msgstr "Имитировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2678 src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2700
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2681 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2688 src/gui/popups/popupmenu.cpp:2703
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2726
+#: src/gui/popups/popupmenu.cpp:2733
 msgid "Show Items"
 msgstr "Показать предметы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2743
+#: src/gui/popups/popupmenu.cpp:2750
 msgid "Remove from pickup list"
 msgstr "Удалить из поднятия"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2748
+#: src/gui/popups/popupmenu.cpp:2755
 msgid "Add to pickup list"
 msgstr "Сделать поднимаемым"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2797
+#: src/gui/popups/popupmenu.cpp:2804
 msgid "Unprotect item"
 msgstr "Снять защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2806
+#: src/gui/popups/popupmenu.cpp:2813
 msgid "Protect item"
 msgstr "Поставить защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:189
+#: src/gui/popups/popupmenu.cpp:2842 src/gui/windows/inventorywindow.cpp:189
 #: src/gui/windows/inventorywindow.cpp:727
 msgid "Drop..."
 msgstr "Бросить..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2838
+#: src/gui/popups/popupmenu.cpp:2845
 msgid "Drop all"
 msgstr "Бросить все"
 
@@ -2172,7 +2172,7 @@ msgstr "Бросить все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:129
+#: src/gui/popups/popupmenu.cpp:2851 src/gui/windowmenu.cpp:129
 #: src/gui/windows/inventorywindow.cpp:732
 msgid "Drop"
 msgstr "Бросить"
@@ -2180,49 +2180,49 @@ msgstr "Бросить"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2852 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2859 src/gui/windows/inventorywindow.cpp:191
 msgid "Split"
 msgstr "Разделить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2862
+#: src/gui/popups/popupmenu.cpp:2869
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2870
+#: src/gui/popups/popupmenu.cpp:2877
 msgid "GM commands"
 msgstr "Коменды ГМ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2882
 msgid "Check ip"
 msgstr "Проверить IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Goto"
 msgstr "Перейти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2888
 msgid "Recall"
 msgstr "Вызвать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:2884 src/net/ea/playerhandler.cpp:380
+#: src/gui/popups/popupmenu.cpp:2891 src/net/ea/playerhandler.cpp:364
 msgid "Revive"
 msgstr "Оживить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2889
+#: src/gui/popups/popupmenu.cpp:2896
 msgid "Kick"
 msgstr "Кикнуть"
 
@@ -2518,11 +2518,21 @@ msgid "Edit"
 msgstr "Изменить"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
+#: src/gui/widgets/skillinfo.cpp:94 src/gui/windows/skilldialog.cpp:402
 #, c-format
 msgid "Lvl: %d"
 msgstr "Уровень: %d"
 
+#: src/gui/widgets/skillinfo.cpp:99
+#, fuzzy, c-format
+msgid "Mana: -%d"
+msgstr "Мана:"
+
+#: src/gui/widgets/skillinfo.cpp:107
+#, fuzzy, c-format
+msgid "Range: %d"
+msgstr "Расстояние %s"
+
 #. TRANSLATORS: battle chat tab name
 #: src/gui/widgets/tabs/battletab.cpp:36
 msgid "Battle"
@@ -3975,7 +3985,7 @@ msgstr "Разрешить шептание"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:83
 #: src/gui/windows/serverdialog.cpp:119 src/gui/windows/shopwindow.cpp:102
 #: src/gui/windows/shopwindow.cpp:109 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
@@ -4810,7 +4820,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:261 src/gui/windows/charcreatedialog.cpp:128
-#: src/gui/windows/charselectdialog.cpp:571
+#: src/gui/windows/charselectdialog.cpp:581
 #: src/gui/windows/socialwindow.cpp:85
 msgid "Create"
 msgstr "Создать"
@@ -4881,7 +4891,7 @@ msgstr "Адрес E-mail не совпадает."
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:52
 #: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:74
 msgid "Change Password"
 msgstr "Изменить пароль"
 
@@ -5035,53 +5045,57 @@ msgid "Are you sure you want to delete this character?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:62
+#: src/gui/windows/charselectdialog.cpp:65
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Аккаунт %s (последний вход %s)"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:69
+#: src/gui/windows/charselectdialog.cpp:72
 msgid "Switch Login"
 msgstr "Сменить героя"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:76
-#: src/gui/windows/charselectdialog.cpp:566
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:576
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Играть"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/net/ea/charserverhandler.cpp:225
+#: src/gui/windows/charselectdialog.cpp:81
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Info"
 msgstr "Сведения"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/charselectdialog.cpp:108
 #: src/gui/windows/unregisterdialog.cpp:51
 #: src/gui/windows/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Удалить регистрацию"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:117
+#: src/gui/windows/charselectdialog.cpp:120
 msgid "Change Email"
 msgstr "Сменить адрес E-mail"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:155
+#: src/gui/windows/charselectdialog.cpp:158
 #, c-format
 msgid "Account %s"
 msgstr "Аккаунт %s"
 
+#: src/gui/windows/charselectdialog.cpp:186
+msgid "Please set new pincode"
+msgstr ""
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:229
+#: src/gui/windows/charselectdialog.cpp:239
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5096,16 +5110,16 @@ msgstr ""
 "Опыт: %u\n"
 "Деньги: %s"
 
-#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:291
 msgid "Incorrect password"
 msgstr "Неправильный пароль"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password for deleting character"
 msgstr "Введите пароль для удаления персонажа"
 
-#: src/gui/windows/charselectdialog.cpp:421
+#: src/gui/windows/charselectdialog.cpp:431
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
@@ -5742,7 +5756,7 @@ msgstr "Аукцион"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:100
+#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:232
 msgid "Request for Trade"
 msgstr "Запрос на Торговлю"
 
@@ -5757,19 +5771,19 @@ msgid "Up"
 msgstr "Верх"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:191
+#: src/gui/windows/skilldialog.cpp:183
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Очков навыков осталось: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:251
+#: src/gui/windows/skilldialog.cpp:253
 #, c-format
 msgid "Skill Set %d"
 msgstr "Умение %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:287
+#: src/gui/windows/skilldialog.cpp:289
 #, c-format
 msgid "Skill %d"
 msgstr "Умение %d"
@@ -6095,7 +6109,7 @@ msgid "Completed"
 msgstr "Завершено"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:635
+#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:633
 msgid "Who Is Online - Updating"
 msgstr "Кто онлайн - обновление"
 
@@ -6105,17 +6119,17 @@ msgid "Update"
 msgstr "Обновить"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:228
 msgid "Who Is Online - "
 msgstr "Кто онлайн - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:650
+#: src/gui/windows/whoisonline.cpp:648
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:692
+#: src/gui/windows/whoisonline.cpp:690
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
@@ -6389,39 +6403,80 @@ msgstr "Модификатор смайлов"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:49
+#, fuzzy
+msgid "Pet emote modifier key"
+msgstr "Модификатор смайлов"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:55
 msgid "Emote shortcuts"
 msgstr "Ярлыки смайлов"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/emotes.cpp:55 src/input/pages/emotes.cpp:61
-#: src/input/pages/emotes.cpp:67 src/input/pages/emotes.cpp:73
-#: src/input/pages/emotes.cpp:79 src/input/pages/emotes.cpp:85
-#: src/input/pages/emotes.cpp:91 src/input/pages/emotes.cpp:97
-#: src/input/pages/emotes.cpp:103 src/input/pages/emotes.cpp:109
-#: src/input/pages/emotes.cpp:115 src/input/pages/emotes.cpp:121
-#: src/input/pages/emotes.cpp:127 src/input/pages/emotes.cpp:133
-#: src/input/pages/emotes.cpp:139 src/input/pages/emotes.cpp:145
-#: src/input/pages/emotes.cpp:151 src/input/pages/emotes.cpp:157
-#: src/input/pages/emotes.cpp:163 src/input/pages/emotes.cpp:169
-#: src/input/pages/emotes.cpp:175 src/input/pages/emotes.cpp:181
-#: src/input/pages/emotes.cpp:187 src/input/pages/emotes.cpp:193
-#: src/input/pages/emotes.cpp:199 src/input/pages/emotes.cpp:205
-#: src/input/pages/emotes.cpp:211 src/input/pages/emotes.cpp:217
-#: src/input/pages/emotes.cpp:223 src/input/pages/emotes.cpp:229
-#: src/input/pages/emotes.cpp:235 src/input/pages/emotes.cpp:241
-#: src/input/pages/emotes.cpp:247 src/input/pages/emotes.cpp:253
-#: src/input/pages/emotes.cpp:259 src/input/pages/emotes.cpp:265
-#: src/input/pages/emotes.cpp:271 src/input/pages/emotes.cpp:277
-#: src/input/pages/emotes.cpp:283 src/input/pages/emotes.cpp:289
-#: src/input/pages/emotes.cpp:295 src/input/pages/emotes.cpp:301
-#: src/input/pages/emotes.cpp:307 src/input/pages/emotes.cpp:313
-#: src/input/pages/emotes.cpp:319 src/input/pages/emotes.cpp:325
-#: src/input/pages/emotes.cpp:331 src/input/pages/emotes.cpp:337
+#: src/input/pages/emotes.cpp:61 src/input/pages/emotes.cpp:67
+#: src/input/pages/emotes.cpp:73 src/input/pages/emotes.cpp:79
+#: src/input/pages/emotes.cpp:85 src/input/pages/emotes.cpp:91
+#: src/input/pages/emotes.cpp:97 src/input/pages/emotes.cpp:103
+#: src/input/pages/emotes.cpp:109 src/input/pages/emotes.cpp:115
+#: src/input/pages/emotes.cpp:121 src/input/pages/emotes.cpp:127
+#: src/input/pages/emotes.cpp:133 src/input/pages/emotes.cpp:139
+#: src/input/pages/emotes.cpp:145 src/input/pages/emotes.cpp:151
+#: src/input/pages/emotes.cpp:157 src/input/pages/emotes.cpp:163
+#: src/input/pages/emotes.cpp:169 src/input/pages/emotes.cpp:175
+#: src/input/pages/emotes.cpp:181 src/input/pages/emotes.cpp:187
+#: src/input/pages/emotes.cpp:193 src/input/pages/emotes.cpp:199
+#: src/input/pages/emotes.cpp:205 src/input/pages/emotes.cpp:211
+#: src/input/pages/emotes.cpp:217 src/input/pages/emotes.cpp:223
+#: src/input/pages/emotes.cpp:229 src/input/pages/emotes.cpp:235
+#: src/input/pages/emotes.cpp:241 src/input/pages/emotes.cpp:247
+#: src/input/pages/emotes.cpp:253 src/input/pages/emotes.cpp:259
+#: src/input/pages/emotes.cpp:265 src/input/pages/emotes.cpp:271
+#: src/input/pages/emotes.cpp:277 src/input/pages/emotes.cpp:283
+#: src/input/pages/emotes.cpp:289 src/input/pages/emotes.cpp:295
+#: src/input/pages/emotes.cpp:301 src/input/pages/emotes.cpp:307
+#: src/input/pages/emotes.cpp:313 src/input/pages/emotes.cpp:319
+#: src/input/pages/emotes.cpp:325 src/input/pages/emotes.cpp:331
+#: src/input/pages/emotes.cpp:337 src/input/pages/emotes.cpp:343
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Комбинация клавиш для смайла %d"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:354
+#, fuzzy
+msgid "Pet emote shortcuts"
+msgstr "Ярлыки смайлов"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/emotes.cpp:360 src/input/pages/emotes.cpp:366
+#: src/input/pages/emotes.cpp:372 src/input/pages/emotes.cpp:378
+#: src/input/pages/emotes.cpp:384 src/input/pages/emotes.cpp:390
+#: src/input/pages/emotes.cpp:396 src/input/pages/emotes.cpp:402
+#: src/input/pages/emotes.cpp:408 src/input/pages/emotes.cpp:414
+#: src/input/pages/emotes.cpp:420 src/input/pages/emotes.cpp:426
+#: src/input/pages/emotes.cpp:432 src/input/pages/emotes.cpp:438
+#: src/input/pages/emotes.cpp:444 src/input/pages/emotes.cpp:450
+#: src/input/pages/emotes.cpp:456 src/input/pages/emotes.cpp:462
+#: src/input/pages/emotes.cpp:468 src/input/pages/emotes.cpp:474
+#: src/input/pages/emotes.cpp:480 src/input/pages/emotes.cpp:486
+#: src/input/pages/emotes.cpp:492 src/input/pages/emotes.cpp:498
+#: src/input/pages/emotes.cpp:504 src/input/pages/emotes.cpp:510
+#: src/input/pages/emotes.cpp:516 src/input/pages/emotes.cpp:522
+#: src/input/pages/emotes.cpp:528 src/input/pages/emotes.cpp:534
+#: src/input/pages/emotes.cpp:540 src/input/pages/emotes.cpp:546
+#: src/input/pages/emotes.cpp:552 src/input/pages/emotes.cpp:558
+#: src/input/pages/emotes.cpp:564 src/input/pages/emotes.cpp:570
+#: src/input/pages/emotes.cpp:576 src/input/pages/emotes.cpp:582
+#: src/input/pages/emotes.cpp:588 src/input/pages/emotes.cpp:594
+#: src/input/pages/emotes.cpp:600 src/input/pages/emotes.cpp:606
+#: src/input/pages/emotes.cpp:612 src/input/pages/emotes.cpp:618
+#: src/input/pages/emotes.cpp:624 src/input/pages/emotes.cpp:630
+#: src/input/pages/emotes.cpp:636 src/input/pages/emotes.cpp:642
+#, fuzzy, c-format
+msgid "Pet emote shortcut %d"
+msgstr "Комбинация клавиш для смайла %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/gui.cpp:33
 msgid "Move & selection"
 msgstr "Движение и выбор"
@@ -6747,7 +6802,6 @@ msgstr "Выключить отладочные эффекты частиц"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:276
-#, fuzzy
 msgid "Create items (for gms)"
 msgstr "Создание предметов (для ГМ)"
 
@@ -7193,113 +7247,120 @@ msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : Не использовать OpenGL для этой сессии"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:77
+#: src/net/ea/charserverhandler.cpp:73
 msgid "Strength:"
 msgstr "Сила (str):"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:79
+#: src/net/ea/charserverhandler.cpp:75
 msgid "Agility:"
 msgstr "Выносливость (agi):"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:81
+#: src/net/ea/charserverhandler.cpp:77
 msgid "Vitality:"
 msgstr "Живучесть (vit):"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:83
+#: src/net/ea/charserverhandler.cpp:79
 msgid "Intelligence:"
 msgstr "Интеллект (int):"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:85
+#: src/net/ea/charserverhandler.cpp:81
 msgid "Dexterity:"
 msgstr "Ловкость (dex):"
 
 #. TRANSLATORS: playe stat
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverhandler.cpp:83
 msgid "Luck:"
 msgstr "Удача (luk):"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:134
 msgid "Cannot use this ID."
 msgstr "Нельзя использовать данный ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:138
 msgid "Unknown char-server failure."
 msgstr "Неизвестная ошибка сервера персонажей."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:177
+#: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Невозможно создать персонажа. Скорее всего, такое имя уже используется."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:182 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:177 src/net/ea/loginhandler.cpp:279
+#: src/net/eathena/loginhandler.cpp:237
 msgid "Wrong name."
 msgstr "Некорректное имя."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:186
+#: src/net/ea/charserverhandler.cpp:181
 msgid "Incorrect stats."
 msgstr "Некорректные статы."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:190
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Incorrect hair."
 msgstr "Некорректный тип волос."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:194
+#: src/net/ea/charserverhandler.cpp:189
 msgid "Incorrect slot."
 msgstr "Некорректный слот."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:198
+#: src/net/ea/charserverhandler.cpp:193
 msgid "Incorrect race."
 msgstr "Неправильная раса."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:202
+#: src/net/ea/charserverhandler.cpp:197
 msgid "Incorrect look."
 msgstr "Неправильная внешность."
 
-#: src/net/ea/charserverhandler.cpp:225
+#: src/net/ea/charserverhandler.cpp:220
 msgid "Character deleted."
 msgstr "Персонаж удален."
 
-#: src/net/ea/charserverhandler.cpp:238
+#: src/net/ea/charserverhandler.cpp:233
 msgid "Failed to delete character."
 msgstr "Невозможно удалить персонажа."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:110
+#: src/net/ea/chathandler.cpp:109
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Сообщение не может быть отправлено, %s оффлайн."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:119
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Приватное сообщение не может быть послано: %s игнорирует его."
 
-#: src/net/ea/gamehandler.cpp:94
+#. TRANSLATORS: chat message
+#: src/net/ea/chathandler.cpp:129
+#, fuzzy
+msgid "Whisper could not be sent, you ignored by all players."
+msgstr "Приватное сообщение не может быть послано: %s игнорирует его."
+
+#: src/net/ea/gamehandler.cpp:75
 msgid "Game"
 msgstr "Игра"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:96
+#: src/net/ea/gamehandler.cpp:77
 msgid "Request to quit denied!"
 msgstr "Запрос на выход отклонен!"
 
@@ -7419,43 +7480,44 @@ msgid "New password too short."
 msgstr "Новый пароль слишком короткий."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:291
+#: src/net/eathena/loginhandler.cpp:251
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:237 src/net/eathena/loginhandler.cpp:192
 msgid "Unregistered ID."
 msgstr "Незарегистрированный ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:196
 msgid "Wrong password."
 msgstr "Неверный пароль."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:246 src/net/eathena/loginhandler.cpp:201
 msgid "Account expired."
 msgstr "Учетная запись просрочена."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:250 src/net/eathena/loginhandler.cpp:205
 msgid "Rejected from server."
 msgstr "Получен отказ от сервера."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:254 src/net/eathena/loginhandler.cpp:209
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Вас навсегда забанили. Пожалуйста, свяжитесь с командой ГМ-ов."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:259 src/net/eathena/loginhandler.cpp:214
 msgid "Client too old."
 msgstr "Клиент устарел."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:263 src/net/eathena/loginhandler.cpp:218
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7464,48 +7526,48 @@ msgstr ""
 "Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:271 src/net/eathena/loginhandler.cpp:227
 msgid "Server overpopulated."
 msgstr "Сервер переполнен."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:275 src/net/eathena/loginhandler.cpp:232
 msgid "This user name is already taken."
 msgstr "Это имя пользователя уже занято."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:283 src/net/eathena/loginhandler.cpp:242
 msgid "Incorrect email."
 msgstr "Неправильный email."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:287 src/net/eathena/loginhandler.cpp:247
 msgid "Username permanently erased."
 msgstr "Пользователь удален."
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:100
+#: src/net/ea/network.cpp:101
 msgid "Empty address given to Network::connect()!"
 msgstr "Пустой адрес был передан методу Network::connect()!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:202
+#: src/net/ea/network.cpp:203
 msgid "Unable to resolve host \""
 msgstr "Не удалось найти хост \""
 
 #. TRANSLATORS: error message
-#: src/net/ea/network.cpp:283
+#: src/net/ea/network.cpp:284
 msgid "Connection to server terminated. "
 msgstr "Подключение к серверу прервано. "
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:273 src/net/ea/playerhandler.cpp:289
-#: src/net/ea/playerhandler.cpp:377
+#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
+#: src/net/ea/playerhandler.cpp:361
 msgid "Message"
 msgstr "Сообщение"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:259
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
@@ -7513,283 +7575,283 @@ msgstr ""
 "восстанавливаться не будет."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:291
+#: src/net/ea/playerhandler.cpp:275
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Вес предметов составляет менее половины допустимого. Теперь Вы можете "
 "восстанавливаться."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:155
+#: src/net/ea/skillhandler.cpp:129
 msgid "Trade failed!"
 msgstr "Не удалось начать торговлю!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:159
+#: src/net/ea/skillhandler.cpp:133
 msgid "Emote failed!"
 msgstr "Не удалось использовать смайлик!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/skillhandler.cpp:137
 msgid "Sit failed!"
 msgstr "Не удалось присесть!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:167
+#: src/net/ea/skillhandler.cpp:141
 msgid "Chat creating failed!"
 msgstr "Не удалось создать чат!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:145
 msgid "Could not join party!"
 msgstr "Нельзя присоединиться к группе!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/skillhandler.cpp:149
 msgid "Cannot shout!"
 msgstr "Нельзя кричать!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr "У Вас недостаточный уровень!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/skillhandler.cpp:167
 msgid "Insufficient HP!"
 msgstr "Недостаточно ОЖ!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:197
+#: src/net/ea/skillhandler.cpp:171
 msgid "Insufficient SP!"
 msgstr "Недостаточно Маны!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:175
 msgid "You have no memos!"
 msgstr "У Вас нет записей!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/skillhandler.cpp:179
 msgid "You cannot do that right now!"
 msgstr "Вы не можете сделать это сейчас!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:209
+#: src/net/ea/skillhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Похоже, Вам нужно больше денег... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:213
+#: src/net/ea/skillhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Вы не можете использовать это умение с этим видом оружия!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:218
+#: src/net/ea/skillhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "Вам нужен другой красный камень!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:222
+#: src/net/ea/skillhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr "Вам нужен другой синий камень!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:226
+#: src/net/ea/skillhandler.cpp:200
 msgid "You're carrying to much to do this!"
 msgstr "Вы несёте слишком много, чтобы сделать это!"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:230
+#: src/net/ea/skillhandler.cpp:204
 msgid "Huh? What's that?"
 msgstr "А? Что это?"
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:242
+#: src/net/ea/skillhandler.cpp:216
 msgid "Warp failed..."
 msgstr "Изменение не удалось..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:246
+#: src/net/ea/skillhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr "Не удалось ничего украсть..."
 
 #. TRANSLATORS: error message
-#: src/net/ea/skillhandler.cpp:250
+#: src/net/ea/skillhandler.cpp:224
 msgid "Poison had no effect..."
 msgstr "Яд не подействовал..."
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:107
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %s"
 msgstr "Сила (str) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Agility %s"
 msgstr "Выносливость (agi) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Vitality %s"
 msgstr "Живучесть (vit) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Intelligence %s"
 msgstr "Интеллект (int) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:115
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:117
 #, c-format
 msgid "Dexterity %s"
 msgstr "Ловкость (dex) %s"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:117
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:119
 #, c-format
 msgid "Luck %s"
 msgstr "Удача (luk) %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:145
 msgid "Authentication failed."
 msgstr "Ошибка авторизации."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:149
 msgid "No servers available."
 msgstr "Нет доступных серверов."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:153
+#: src/net/eathena/generalhandler.cpp:144 src/net/tmwa/generalhandler.cpp:155
 msgid "Someone else is trying to use this account."
 msgstr "Кто-то еще пытается воспользоваться данным аккаунтом."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:161
 msgid "This account is already logged in."
 msgstr "Этот аккаунт уже в сети."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:166
 msgid "Speed hack detected."
 msgstr "Обнаружен взлом скорости."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:170
 msgid "Duplicated login."
 msgstr "Двойная попытка подключения."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:172
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:174
 msgid "Unknown connection error."
 msgstr "Неизвестная ошибка подключения."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:254
+#: src/net/eathena/generalhandler.cpp:233 src/net/tmwa/generalhandler.cpp:256
 msgid "Got disconnected from server!"
 msgstr "Отключено от сервера!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:282
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:284
 msgid "Strength"
 msgstr "Сила (str)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:284
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:286
 msgid "Agility"
 msgstr "Выносливость (agi)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:286
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:288
 msgid "Vitality"
 msgstr "Живучесть (vit)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:290
 msgid "Intelligence"
 msgstr "Интеллект (int)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:290
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:292
 msgid "Dexterity"
 msgstr "Ловкость (dex)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:292
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:294
 msgid "Luck"
 msgstr "Удача (luk)"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:297
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:299
 msgid "Defense"
 msgstr "Защита"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:301
 msgid "M.Attack"
 msgstr "Маг. Атака"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:301
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:303
 msgid "M.Defense"
 msgstr "Маг.Защита"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Точности"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:307
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Evade"
 msgstr "% Уклонения"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:312
 #, no-c-format
 msgid "% Critical"
 msgstr "% Критический удар"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:314
 msgid "Attack Delay"
 msgstr "Задержка атаки"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:316
 msgid "Walk Delay"
 msgstr "Задержка движения"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:318
 msgid "Attack Range"
 msgstr "Зона атаки"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:320
 msgid "Damage per sec."
 msgstr "Урон в сек."
 
-#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:102
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s хочет торговать с Вами, Вы принимаете предложение?"
-
 #. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:149
+#: src/net/ea/tradehandler.cpp:100
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Торговля: Вы и %s"
 
+#. TRANSLATORS: trade message
+#: src/net/ea/tradehandler.cpp:234
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s хочет торговать с Вами, Вы принимаете предложение?"
+
 #. TRANSLATORS: draw backend
 #: src/render/rendererslistsdl2.h:45 src/render/rendererslistsdl2.h:81
 #: src/render/rendererslistsdl2.h:121 src/render/rendererslistsdl.h:47
@@ -7830,7 +7892,7 @@ msgstr "Новый OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:324 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "безымянный"