Update translations.

1 files changed, 224 insertions, 158 deletions

diff --git a/po/ru.po b/po/ru.po
index b4b817969..6c9b81609 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-04 15:55+0300\n"
+"POT-Creation-Date: 2015-08-14 22:58+0300\n"
 "PO-Revision-Date: 2015-08-04 13:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
@@ -32,7 +32,7 @@ msgstr ""
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:155
+#: src/actions/actions.cpp:158
 msgid "File uploaded"
 msgstr "Файл выгружен"
 
@@ -45,7 +45,7 @@ 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/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
@@ -65,126 +65,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 "Время работы клиента: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d week"
 msgstr "%d неделя"
 
-#: src/actions/actions.cpp:1144
+#: src/actions/actions.cpp:1171
 #, c-format
 msgid "%d weeks"
 msgstr "%d недель"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d day"
 msgstr "%d день"
 
-#: src/actions/actions.cpp:1155
+#: src/actions/actions.cpp:1182
 #, c-format
 msgid "%d days"
 msgstr "%d дней"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hour"
 msgstr "%d час"
 
-#: src/actions/actions.cpp:1165
+#: src/actions/actions.cpp:1192
 #, c-format
 msgid "%d hours"
 msgstr "%d часов"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minute"
 msgstr "%d минута"
 
-#: src/actions/actions.cpp:1175
+#: src/actions/actions.cpp:1202
 #, c-format
 msgid "%d minutes"
 msgstr "%d минут"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d second"
 msgstr "%d секунда"
 
-#: src/actions/actions.cpp:1185
+#: src/actions/actions.cpp:1212
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
 
 #. 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 "Невозможно создать вкладку \"%s\"! Возможно она уже существует."
 
 #. 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 "Не задано имя гильдии."
 
@@ -192,115 +192,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 "Теперь Return переключает чат."
 
 #. 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 "Одета шапка: %s."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:125
 #, c-format
 msgid "Player already %s!"
 msgstr "Игрок уже %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:135
+#: src/actions/commands.cpp:138
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Игрок удачно %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:140
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Игрок не может быть %s!"
 
 #. 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 "Значение настройки: %s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:961
+#: src/actions/commands.cpp:1025
 #, c-format
 msgid "Server config value: %s"
 msgstr "Значение настройки для этого сервера: %s"
@@ -320,92 +320,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 "Вы были убиты %s."
 
 #. 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@@]."
@@ -416,53 +416,53 @@ msgstr[3] "Вы подняли %d [@@%d|%s@@]."
 
 #. 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 "Следовать за: %s"
 
 #. 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 "Имитация: %s"
 
 #. 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 "Вы видите %s"
@@ -500,40 +500,40 @@ msgstr "Плавающий пузырек"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:805 src/dyetool/client.cpp:486 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/dyetool/client.cpp:489
+#: 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/dyetool/client.cpp:492
+#: 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/dyetool/client.cpp:495
+#: 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/dyetool/client.cpp:498
+#: 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/dyetool/client.cpp:501 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 "Помощь"
@@ -553,8 +553,8 @@ 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/dyetool/client.cpp:505 src/gui/dialogsmanager.cpp:116
+#: 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
@@ -566,32 +566,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 "Смена игрового сервера"
 
@@ -605,7 +605,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
@@ -614,45 +614,45 @@ 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 "Сменить Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1484
+#: src/client.cpp:1507
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
 #. 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 "Хорошо, возвращайтесь в любое время..."
 
@@ -824,36 +824,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_строка_цвета файл_назначения"
 
 #. 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 "Снимок экрана сохранен как %s"
 
 #. 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 "Ошибка сети"
 
@@ -2289,8 +2289,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 "Использовать"
@@ -2961,7 +2961,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 "Уровень: %d"
@@ -4064,12 +4064,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 "Использовать джойстик если игра свернута"
 
@@ -5868,8 +5868,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 "Сведения"
 
@@ -5956,12 +5956,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 "животное %s'а"
@@ -6720,24 +6720,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 "Очков навыков осталось: %d"
 
 #. 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 "Навык %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:308
+#: src/gui/windows/skilldialog.cpp:310
 #, c-format
 msgid "Skill %d"
 msgstr "Навык %d"
 
-#: src/gui/windows/skilldialog.cpp:484
+#: src/gui/windows/skilldialog.cpp:486
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Неудача навыка: %s"
@@ -8482,34 +8482,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 "Невозможно удалить персонажа."
 
@@ -8887,32 +8887,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 "Сила (str):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:334
+#: src/net/tmwa/charserverhandler.cpp:309
 msgid "Agility:"
 msgstr "Выносливость (agi):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:336
+#: src/net/tmwa/charserverhandler.cpp:311
 msgid "Vitality:"
 msgstr "Живучесть (vit):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:338
+#: src/net/tmwa/charserverhandler.cpp:313
 msgid "Intelligence:"
 msgstr "Интеллект (int):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:340
+#: src/net/tmwa/charserverhandler.cpp:315
 msgid "Dexterity:"
 msgstr "Ловкость (dex):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:342
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Luck:"
 msgstr "Удача (luk):"
 
@@ -9006,7 +9006,7 @@ msgstr "Новый OpenGL"
 #. 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 "безымянный"
@@ -9017,74 +9017,140 @@ msgstr "безымянный"
 msgid "Attack %s"
 msgstr "Атака %s"
 
-#. TRANSLATORS: item info label (attack)
+#. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:99
+#, fuzzy, c-format
+msgid "Min attack %s"
+msgstr "Маг. атака %s"
+
+#. TRANSLATORS: item info label (max attack)
+#: src/resources/db/itemdb.cpp:101
+#, fuzzy, c-format
+msgid "Max attack %s"
+msgstr "Маг. атака %s"
+
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Critical attack %s"
 msgstr "Критическая атака %s"
 
 #. 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 "Маг. атака %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "Defense %s"
 msgstr "Защита %s"
 
-#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:105
+#. TRANSLATORS: item info label (min defence)
+#: src/resources/db/itemdb.cpp:109
+#, fuzzy, c-format
+msgid "Min defense %s"
+msgstr "Маг. защита %s"
+
+#. TRANSLATORS: item info label (max defence)
+#: src/resources/db/itemdb.cpp:111
+#, fuzzy, c-format
+msgid "Max defense %s"
+msgstr "Маг. защита %s"
+
+#. TRANSLATORS: item info label (critical defence)
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Critical defense %s"
 msgstr "Защита от критической атаки %s"
 
 #. 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 "Маг. защита %s"
 
+#. TRANSLATORS: item info label (min magic defence)
+#: src/resources/db/itemdb.cpp:117
+#, fuzzy, c-format
+msgid "Min M. Defense %s"
+msgstr "Маг. защита %s"
+
+#. TRANSLATORS: item info label (max magic defence)
+#: src/resources/db/itemdb.cpp:119
+#, fuzzy, c-format
+msgid "Max M. Defense %s"
+msgstr "Маг. защита %s"
+
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "HP %s"
 msgstr "Жизнь %s"
 
+#. TRANSLATORS: item info label (max health)
+#: src/resources/db/itemdb.cpp:123
+#, fuzzy, c-format
+msgid "Max HP %s"
+msgstr "Жизнь %s"
+
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "MP %s"
 msgstr "Мана %s"
 
+#. TRANSLATORS: item info label (max mana)
+#: src/resources/db/itemdb.cpp:127
+#, fuzzy, c-format
+msgid "Max MP %s"
+msgstr "Мана %s"
+
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Level %s"
 msgstr "Уровень: %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Speed %s"
 msgstr "Скорость %s"
 
-#. 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 "Расстояние %s"
 
-#. 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 "Уклонение %s"
 
+#. TRANSLATORS: item info label (min flee)
+#: src/resources/db/itemdb.cpp:137
+#, fuzzy, c-format
+msgid "Min flee %s"
+msgstr "Уклонение %s"
+
+#. TRANSLATORS: item info label (max flee)
+#: src/resources/db/itemdb.cpp:139
+#, fuzzy, c-format
+msgid "Max flee %s"
+msgstr "Уклонение %s"
+
+#. TRANSLATORS: item info label (card slots number)
+#: src/resources/db/itemdb.cpp:141
+#, fuzzy, 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 "Неизвестный предмет"
 
@@ -9212,8 +9278,8 @@ msgstr "Вас выгнали из гильдии."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:130
-#, c-format
-msgid "%s has kicked from your guild."
+#, fuzzy, c-format
+msgid "%s has been kicked from your guild."
 msgstr "%s был вышвырнут из Вашей гильдии."
 
 #. TRANSLATORS: notification message