summaryrefslogtreecommitdiff
path: root/po/ru.po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-13 17:48:46 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-13 17:48:46 +0300
commit609b40bd07b963020389812aae41344f55a51ee1 (patch)
tree74b82fe7e6b6daa399b02e4685e471514be82db1 /po/ru.po
parent56e0334fee8baf572587df2175761259db544dac (diff)
downloadManaVerse-609b40bd07b963020389812aae41344f55a51ee1.tar.gz
ManaVerse-609b40bd07b963020389812aae41344f55a51ee1.tar.bz2
ManaVerse-609b40bd07b963020389812aae41344f55a51ee1.tar.xz
ManaVerse-609b40bd07b963020389812aae41344f55a51ee1.zip
Update translations.
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po1662
1 files changed, 894 insertions, 768 deletions
diff --git a/po/ru.po b/po/ru.po
index 746724f38..89404e738 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR The ManaPlus Developers
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# Alexandr Uspensky <AlexandrUSP@yandex.com>, 2015
# Alexsl <alexlsh@mail.ru>, 2013-2015
@@ -21,18 +21,21 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-07-19 21:56+0300\n"
+"POT-Creation-Date: 2016-08-13 17:42+0300\n"
"PO-Revision-Date: 2016-07-20 12:57+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
+"ru/)\n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
#. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:168
+#: src/actions/actions.cpp:164
msgid "File uploaded"
msgstr "Файл выгружен"
@@ -45,7 +48,7 @@ msgstr "Файл выгружен"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
+#: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
#: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -57,15 +60,15 @@ msgstr "Файл выгружен"
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
#: src/gui/windows/charcreatedialog.cpp:475
-#: src/gui/windows/charselectdialog.cpp:262
-#: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
+#: src/gui/windows/charselectdialog.cpp:258
+#: src/gui/windows/charselectdialog.cpp:301 src/gui/windows/editdialog.cpp:50
#: src/gui/windows/editserverdialog.cpp:59
-#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/editserverdialog.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
+#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
+#: src/net/eathena/charserverrecv.cpp:423
#: src/net/eathena/charserverrecv.cpp:458
#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
msgid "OK"
@@ -73,59 +76,61 @@ msgstr "ОК"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1045 src/actions/actions.cpp:1058
+#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
msgid "Cache cleaned"
msgstr "Кеш очищен"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1215 src/actions/actions.cpp:1221
+#: src/actions/actions.cpp:1210 src/actions/actions.cpp:1216
#, c-format
msgid "Client uptime: %s"
msgstr "Время работы клиента: %s"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1273 src/actions/actions.cpp:1282
msgid "Resource images:"
msgstr "Изображений:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1281 src/actions/actions.cpp:1291
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1286
msgid "Resource orphaned images:"
msgstr "Удаленных изображений:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1386
+#: src/actions/actions.cpp:1381
msgid "Environment variables dumped"
msgstr "Переменные среды сохранены"
#. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1503
+#: src/actions/actions.cpp:1498
msgid "Uploaded config into:"
msgstr "Информация о выгруженном конфиге:"
#. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1513
+#: src/actions/actions.cpp:1508
msgid "Uploaded server config into:"
msgstr "Информация о выгруженном конфиге сервера:"
#. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1523
+#: src/actions/actions.cpp:1518
msgid "Uploaded log into:"
msgstr "Информация о выгруженном логе:"
#. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1748
+#: src/actions/actions.cpp:1737
msgid ""
"Last seen disabled. Enable in players / collect players id and seen log."
-msgstr "Сбор информации о пользователя отключен. Включите его в игроки / собирать ид игроков и лог встреч."
+msgstr ""
+"Сбор информации о пользователя отключен. Включите его в игроки / собирать ид "
+"игроков и лог встреч."
#. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1767 src/actions/actions.cpp:1781
+#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
msgid "You not saw this nick."
msgstr "Вам не встречался этот ник."
#. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1773
+#: src/actions/actions.cpp:1762
#, c-format
msgid "Last seen for %s: %s"
msgstr "Последняя встреча с %s: %s"
@@ -158,7 +163,7 @@ msgstr "Не задано имя гильдии."
#. TRANSLATORS: change relation
#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
-#: src/actions/commands.cpp:107
+#: src/actions/commands.cpp:99
msgid "Please specify a name."
msgstr "Пожалуйста, укажите имя."
@@ -193,102 +198,102 @@ msgid "equipped hat %s."
msgstr "Одета шапка: %s."
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:142
#, c-format
msgid "Player already %s!"
msgstr "Игрок уже %s!"
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:163
+#: src/actions/commands.cpp:155
#, c-format
msgid "Player successfully %s!"
msgstr "Игрок удачно %s!"
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:165
+#: src/actions/commands.cpp:157
#, c-format
msgid "Player could not be %s!"
msgstr "Игрок не может быть %s!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:200
+#: src/actions/commands.cpp:192
msgid "Player wasn't ignored!"
msgstr "Игрок не был игнорируемым!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:201
msgid "Player no longer ignored!"
msgstr "Игрок больше не игнорируется!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:211
+#: src/actions/commands.cpp:203
msgid "Player could not be unignored!"
msgstr "Игрок не может быть удален из списка игнорирования!"
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:218
msgid "Player already erased!"
msgstr "Игрок и так уже удален!"
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:239
+#: src/actions/commands.cpp:231
msgid "Player no longer erased!"
msgstr "Игрок больше не удален!"
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:241
+#: src/actions/commands.cpp:233
msgid "Player could not be erased!"
msgstr "Игрок не может быть удален!"
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:248
+#: src/actions/commands.cpp:240
msgid "friend"
msgstr "друг"
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:255
+#: src/actions/commands.cpp:247
msgid "disregarded"
msgstr "пренебрегаемый"
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:262
+#: src/actions/commands.cpp:254
msgid "neutral"
msgstr "нейтральный"
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:269
+#: src/actions/commands.cpp:261
msgid "blacklisted"
msgstr "добавлен в черный список"
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:276
+#: src/actions/commands.cpp:268
msgid "enemy"
msgstr "враг"
#. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:569
+#: src/actions/commands.cpp:560
msgid "Quick message"
msgstr "Быстрое сообщение"
#. TRANSLATORS: dialog header
-#: src/actions/commands.cpp:920
+#: src/actions/commands.cpp:908
msgid "Rename your homun"
msgstr "Переименовать гомункула"
#. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1105
+#: src/actions/commands.cpp:1074
#, c-format
msgid "Config value: %s"
msgstr "Значение настройки: %s"
#. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1118
+#: src/actions/commands.cpp:1087
#, c-format
msgid "Server config value: %s"
msgstr "Значение настройки для этого сервера: %s"
#. TRANSLATORS: dialog header
-#: src/actions/pets.cpp:110
+#: src/actions/pets.cpp:106
msgid "Rename your pet"
msgstr "Переименовать животное"
@@ -304,12 +309,12 @@ msgstr "Принимать предложения о торговле"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:323 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:309 src/gui/widgets/tabs/setup_quick.cpp:45
msgid "Quick"
msgstr "Быстро"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1552
+#: src/actormanager.cpp:1579
msgid "Visible on map"
msgstr "Видимые на карте"
@@ -319,79 +324,79 @@ msgid "Human"
msgstr "Человек"
#. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:686
+#: src/being/being.cpp:700
msgid "dodge"
msgstr "уклонение"
-#: src/being/being.cpp:686
+#: src/being/being.cpp:700
msgid "miss"
msgstr "промах"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2312 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2336 src/gui/windows/whoisonline.cpp:883
msgid "A"
msgstr "О"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2317 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2341 src/gui/windows/whoisonline.cpp:888
msgid "I"
msgstr "Б"
#. TRANSLATORS: chat message after death
#. TRANSLATORS: player killed message
-#: src/being/localplayer.cpp:399 src/net/eathena/playerrecv.cpp:454
+#: src/being/localplayer.cpp:400 src/net/eathena/playerrecv.cpp:471
#, c-format
msgid "You were killed by %s."
msgstr "Вы были убиты %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:878
+#: src/being/localplayer.cpp:875
msgid "Tried to pick up nonexistent item."
msgstr "Попытка поднять несуществующий предмет."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:882
+#: src/being/localplayer.cpp:879
msgid "Item is too heavy."
msgstr "Предмет слишком тяжелый."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:886
+#: src/being/localplayer.cpp:883
msgid "Item is too far away."
msgstr "Предмет слишком далеко."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:887
msgid "Inventory is full."
msgstr "Инвентарь переполнен."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:894
+#: src/being/localplayer.cpp:891
msgid "Stack is too big."
msgstr "Слишком много предметов."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:898
+#: src/being/localplayer.cpp:895
msgid "Item belongs to someone else."
msgstr "Предмет принадлежит кому-то еще."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:902
+#: src/being/localplayer.cpp:899
msgid "You can't pickup this amount of items."
msgstr "Вы не можете поднять такое количество."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:906
+#: src/being/localplayer.cpp:903
msgid "Your item stack has max amount."
msgstr "Слишком много предметов в стэке."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:913
+#: src/being/localplayer.cpp:910
msgid "Unknown problem picking up item."
msgstr "Неизвестная проблема при поднятии предмета."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:937
+#: src/being/localplayer.cpp:934
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -402,53 +407,59 @@ msgstr[3] "Вы подняли %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1115 src/being/localplayer.cpp:1117
-#: src/being/localplayer.cpp:1143
+#: src/being/localplayer.cpp:1112 src/being/localplayer.cpp:1114
+#: src/being/localplayer.cpp:1140 src/being/localplayer.cpp:1153
msgid "xp"
msgstr "опыт"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1121 src/being/localplayer.cpp:1127
-#: src/being/localplayer.cpp:1133
+#: src/being/localplayer.cpp:1118 src/being/localplayer.cpp:1124
+#: src/being/localplayer.cpp:1130
msgid "job"
msgstr "работа"
+#. TRANSLATORS: get homunculus xp message
+#: src/being/localplayer.cpp:1150
+#, fuzzy
+msgid "Homun"
+msgstr "Гомункул"
+
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1152
+#: src/being/localplayer.cpp:1162
msgid "hp"
msgstr "здоровье"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1161
+#: src/being/localplayer.cpp:1171
msgid "mana"
msgstr "мана"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2246
+#: src/being/localplayer.cpp:2255
#, c-format
msgid "Follow: %s"
msgstr "Следовать за: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2252 src/being/localplayer.cpp:2277
+#: src/being/localplayer.cpp:2261 src/being/localplayer.cpp:2286
msgid "Follow canceled"
msgstr "Следование отменено"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2262
+#: src/being/localplayer.cpp:2271
#, c-format
msgid "Imitation: %s"
msgstr "Имитация: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2268 src/being/localplayer.cpp:2282
+#: src/being/localplayer.cpp:2277 src/being/localplayer.cpp:2291
msgid "Imitation canceled"
msgstr "Имитация отменена"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2627
+#: src/being/localplayer.cpp:2640
#, c-format
msgid "You see %s"
msgstr "Вы видите %s"
@@ -458,8 +469,8 @@ msgstr "Вы видите %s"
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2532
-#: src/gui/popups/popupmenu.cpp:2574
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2517
+#: src/gui/popups/popupmenu.cpp:2559
msgid "Completely ignore"
msgstr "Полностью игнорировать"
@@ -486,41 +497,41 @@ msgstr "Плавающий пузырек"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: long button name for setup window.
#. TRANSLATORS: setup window name
-#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:875 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
#: src/gui/windows/setupwindow.cpp:66
msgid "Setup"
msgstr "Настройка"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:875 src/dyetool/client.cpp:494
+#: src/client.cpp:878 src/dyetool/client.cpp:494
#: src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr "Производительность"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:878 src/dyetool/client.cpp:497
+#: src/client.cpp:881 src/dyetool/client.cpp:497
#: src/gui/widgets/tabs/setup_video.cpp:110
msgid "Video"
msgstr "Видео"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:881 src/dyetool/client.cpp:500
+#: src/client.cpp:884 src/dyetool/client.cpp:500
#: src/gui/widgets/tabs/setup_theme.cpp:121
msgid "Theme"
msgstr "Тема"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:884 src/dyetool/client.cpp:503
+#: src/client.cpp:887 src/dyetool/client.cpp:503
msgid "About"
msgstr "О Программе"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: long button name for help window.
#. TRANSLATORS: help window name
-#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:890 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Помощь"
@@ -541,45 +552,45 @@ msgstr "Помощь"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
+#: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
#: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:758 src/gui/popups/popupmenu.cpp:835
-#: src/gui/popups/popupmenu.cpp:1089 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:273
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
+#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:290
#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
-#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/npcdialog.cpp:86 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:106
msgid "Close"
msgstr "Закрыть"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1120
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1177 src/gui/windowmanager_unittest.cc:653
msgid "Logging in"
msgstr "Авторизация"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1223
+#: src/client.cpp:1226
msgid "Entering game world"
msgstr "Входим в игровой мир"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1372
+#: src/client.cpp:1375
msgid "Requesting characters"
msgstr "Получение списка персонажей"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1415
+#: src/client.cpp:1418
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1427
+#: src/client.cpp:1430
msgid "Changing game servers"
msgstr "Смена игрового сервера"
@@ -591,19 +602,17 @@ msgstr "Смена игрового сервера"
#. TRANSLATORS: error header
#. TRANSLATORS: edit server dialog error header
#. TRANSLATORS: error message
-#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
+#: src/client.cpp:1486 src/client.cpp:1505 src/client.cpp:1710
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:471
-#: src/gui/windows/charselectdialog.cpp:306
-#: src/gui/windows/editserverdialog.cpp:212
-#: src/gui/windows/registerdialog.cpp:256
-#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/gui/windows/charselectdialog.cpp:297
+#: src/gui/windows/editserverdialog.cpp:204
+#: src/gui/windows/registerdialog.cpp:256 src/net/ea/charserverrecv.cpp:105
#: src/net/eathena/charserverrecv.cpp:396
#: src/net/eathena/charserverrecv.cpp:400
#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
@@ -611,40 +620,30 @@ msgid "Error"
msgstr "Ошибка"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1521
+#: src/client.cpp:1524
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1568
+#: src/client.cpp:1571
msgid "Password Change"
msgstr "Изменить Пароль"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1570
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1603
+#: src/client.cpp:1606
msgid "Email Change"
msgstr "Сменить Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1605
+#: src/client.cpp:1608
msgid "Email changed successfully!"
msgstr "Email изменен!"
-#. TRANSLATORS: unregister message header
-#: src/client.cpp:1641
-msgid "Unregister Successful"
-msgstr "Регистрация удалена"
-
-#. TRANSLATORS: unregister message text
-#: src/client.cpp:1643
-msgid "Farewell, come back any time..."
-msgstr "Хорошо, возвращайтесь в любое время..."
-
#. TRANSLATORS: command line help
#: src/commandline.cpp:42
msgid "manaplus [options] [manaplus-file]"
@@ -733,7 +732,8 @@ msgstr " -H --update-host : Использовать этот узел об
#. TRANSLATORS: command line help
#: src/commandline.cpp:89
msgid " -D --default : Choose default character server and character"
-msgstr " -D --default : Выбрать персонаж и сервер персонажей по умолчанию"
+msgstr ""
+" -D --default : Выбрать персонаж и сервер персонажей по умолчанию"
#. TRANSLATORS: command line help
#: src/commandline.cpp:93
@@ -768,7 +768,8 @@ msgstr " --renderer : Устанавливает тип рендера
#. TRANSLATORS: command line help
#: src/commandline.cpp:112
msgid " -T --tests : Start testing drivers and auto configuring"
-msgstr " -T --tests : Запускает проверку драйверов и автоконфигурацию"
+msgstr ""
+" -T --tests : Запускает проверку драйверов и автоконфигурацию"
#. TRANSLATORS: command line help
#: src/commandline.cpp:118
@@ -821,36 +822,36 @@ msgstr "dyecmd файл_строка_цвета файл_назначения"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: chat tab name
-#: src/game.cpp:268 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:262 src/gui/windows/chatwindow.cpp:2221
msgid "General"
msgstr "Общие"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: long button name for debug window.
#. TRANSLATORS: debug window name
-#: src/game.cpp:275 src/gui/windowmenu.cpp:175
+#: src/game.cpp:269 src/gui/windowmenu.cpp:175
#: src/gui/windows/debugwindow.cpp:43
msgid "Debug"
msgstr "Отладка"
#. TRANSLATORS: save file message
-#: src/game.cpp:600
+#: src/game.cpp:588
#, c-format
msgid "Screenshot saved as %s"
msgstr "Снимок экрана сохранен как %s"
#. TRANSLATORS: save file message
-#: src/game.cpp:610
+#: src/game.cpp:598
msgid "Saving screenshot failed!"
msgstr "Ошибка при сохранении снимка экрана!"
#. TRANSLATORS: error message text
-#: src/game.cpp:697
+#: src/game.cpp:685
msgid "The connection to the server was lost."
msgstr "Соединение с сервером потеряно."
#. TRANSLATORS: error message header
-#: src/game.cpp:700
+#: src/game.cpp:688
msgid "Network Error"
msgstr "Ошибка сети"
@@ -1258,21 +1259,24 @@ msgstr "Сообщение"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2911
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
msgid "Revive"
msgstr "Оживить"
#. TRANSLATORS: weight message
#: src/gui/dialogsmanager.cpp:178
msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Вы несете груз больший, чем половина вашей грузоподъемности. Здоровье восстанавливаться не будет."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Вы несете груз больший, чем половина вашей грузоподъемности. Здоровье "
+"восстанавливаться не будет."
#. TRANSLATORS: weight message
#: src/gui/dialogsmanager.cpp:198
msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Вес предметов составляет менее половины допустимого. Теперь Вы можете восстанавливаться."
+msgstr ""
+"Вес предметов составляет менее половины допустимого. Теперь Вы можете "
+"восстанавливаться."
#. TRANSLATORS: chat color
#. TRANSLATORS: inventory sort mode
@@ -1283,8 +1287,7 @@ msgstr "Вес предметов составляет менее половин
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
msgid "default"
msgstr "По умолчанию"
@@ -1445,8 +1448,8 @@ msgstr "Огромный (23)"
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2159
-#: src/gui/popups/popupmenu.cpp:2239 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
msgid "(default)"
msgstr "(по умолчанию)"
@@ -1612,7 +1615,7 @@ msgstr "В черном списке"
#. TRANSLATORS: relation type
#. TRANSLATORS: palette color
-#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:161
+#: src/gui/models/playerrelationlistmodel.h:47 src/gui/userpalette.cpp:168
msgid "Enemy"
msgstr "Враг"
@@ -1688,67 +1691,86 @@ msgid "Skip"
msgstr "Пропустить"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:138 src/gui/popups/beingpopup.cpp:157
+#: src/gui/popups/beingpopup.cpp:137 src/gui/popups/beingpopup.cpp:156
#, c-format
msgid "Hungry: %d"
msgstr "Голод: %d"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:144 src/gui/popups/beingpopup.cpp:163
+#: src/gui/popups/beingpopup.cpp:143 src/gui/popups/beingpopup.cpp:162
#, c-format
msgid "Intimacy: %d"
msgstr "Близость: %d"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:176
+#: src/gui/popups/beingpopup.cpp:174
#, c-format
msgid "Party: %s"
msgstr "Группа: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:186
+#: src/gui/popups/beingpopup.cpp:184
#, c-format
msgid "Guild: %s"
msgstr "Гильдия: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:196
+#: src/gui/popups/beingpopup.cpp:194
#, c-format
msgid "Pvp rank: %u"
msgstr "PvP ранг: %u"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:207
+#: src/gui/popups/beingpopup.cpp:204
#, c-format
msgid "Buy shop: %s"
msgstr "Магазин покупок: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:219
+#: src/gui/popups/beingpopup.cpp:214
#, c-format
msgid "Sell shop: %s"
msgstr "Магазин продаж: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:230
+#: src/gui/popups/beingpopup.cpp:224
#, c-format
msgid "Comment: %s"
msgstr "Комментарий: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:241
+#: src/gui/popups/beingpopup.cpp:235
#, c-format
msgid "Effects: %s"
msgstr "Эффекты: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:253
+#: src/gui/popups/beingpopup.cpp:246
#, c-format
msgid "Chat room: %s"
msgstr "Комната чата: %s"
#. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:262
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: status window label
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
+#: src/gui/windows/statuswindow.cpp:356
+#, c-format
+msgid "Level: %d"
+msgstr "Уровень: %d"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:274
+#, fuzzy, c-format
+msgid "Hp: %d/%d"
+msgstr "Ур.: %d / %d"
+
+#. TRANSLATORS: being popup label
+#: src/gui/popups/beingpopup.cpp:284
#, c-format
msgid "Particles: %u"
msgstr "Частицы: %u"
@@ -1774,35 +1796,33 @@ msgstr "Создать группу"
#. TRANSLATORS: setup button
#. TRANSLATORS: command editor button
#. TRANSLATORS: text dialog button
-#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:454
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:627
-#: src/gui/popups/popupmenu.cpp:681 src/gui/popups/popupmenu.cpp:716
-#: src/gui/popups/popupmenu.cpp:763 src/gui/popups/popupmenu.cpp:788
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:1010
-#: src/gui/popups/popupmenu.cpp:1037 src/gui/popups/popupmenu.cpp:1075
-#: src/gui/popups/popupmenu.cpp:1141 src/gui/popups/popupmenu.cpp:1876
-#: src/gui/popups/popupmenu.cpp:1916 src/gui/popups/popupmenu.cpp:1974
-#: src/gui/popups/popupmenu.cpp:2023 src/gui/popups/popupmenu.cpp:2064
-#: src/gui/popups/popupmenu.cpp:2135 src/gui/popups/popupmenu.cpp:2216
-#: src/gui/popups/popupmenu.cpp:2252 src/gui/popups/popupmenu.cpp:2285
-#: src/gui/popups/popupmenu.cpp:2306 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2354 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2435
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/popups/popupmenu.cpp:2884
-#: src/gui/popups/popupmenu.cpp:3086 src/gui/popups/popupmenu.cpp:3228
-#: src/gui/popups/popupmenu.cpp:3261 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
+#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
+#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
+#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
+#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
+#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
+#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
+#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
+#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
+#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
+#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:56
#: src/gui/windows/changepassworddialog.cpp:58
#: src/gui/windows/charcreatedialog.cpp:114
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:198 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/unregisterdialog.cpp:55
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
msgid "Cancel"
msgstr "Отмена"
@@ -1814,13 +1834,13 @@ msgid "Weight: %s"
msgstr "Вес: %s"
#. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:291
+#: src/gui/popups/itempopup.cpp:288
#, c-format
msgid "Item named: %s"
msgstr "Именной предмет для: %s"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:318
+#: src/gui/popups/itempopup.cpp:315
msgid "Cards: "
msgstr "Карты: "
@@ -1828,9 +1848,9 @@ msgstr "Карты: "
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
#. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
#: src/gui/widgets/tabs/chat/tradetab.cpp:39
-#: src/resources/inventory/inventory.cpp:362
+#: src/resources/inventory/inventory.cpp:358
msgid "Trade"
msgstr "Торговать"
@@ -1842,8 +1862,8 @@ msgstr "Торговать"
#. TRANSLATORS: attack player
#. TRANSLATORS: input action name
#. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:306
-#: src/gui/popups/popupmenu.cpp:914 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
+#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
#: src/resources/skill/skilltypelist.h:35
msgid "Attack"
msgstr "Атака"
@@ -1854,36 +1874,36 @@ msgstr "Атака"
#. TRANSLATORS: whisper to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:185 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
+#: src/gui/popups/popupmenu.cpp:538
msgid "Whisper"
msgstr "Приват"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:192 src/gui/popups/popupmenu.cpp:919
-#: src/gui/popups/popupmenu.cpp:2976
+#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
+#: src/gui/popups/popupmenu.cpp:2959
msgid "Heal"
msgstr "Лечить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:212 src/gui/popups/popupmenu.cpp:228
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
+#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
msgid "Kick from guild"
msgstr "Выкинуть из гильдии"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:219 src/gui/popups/popupmenu.cpp:235
-#: src/gui/popups/popupmenu.cpp:603 src/gui/popups/popupmenu.cpp:954
+#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
+#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
msgid "Change pos in guild"
msgstr "Сменить позицию в гильдии"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:248 src/gui/popups/popupmenu.cpp:615
-#: src/gui/popups/popupmenu.cpp:968
+#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
+#: src/gui/popups/popupmenu.cpp:961
msgid "Invite to guild"
msgstr "Пригласить в гильдию"
@@ -1891,7 +1911,7 @@ msgstr "Пригласить в гильдию"
#. TRANSLATORS: set player invisible for self by id
#. TRANSLATORS: popup menu item
#. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2947
+#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
msgid "Nuke"
msgstr "Уничтожить"
@@ -1908,9 +1928,9 @@ msgstr "Уничтожить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move to player location
#. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:577 src/gui/popups/popupmenu.cpp:744
-#: src/gui/popups/popupmenu.cpp:926 src/gui/popups/popupmenu.cpp:995
+#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
+#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
+#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
#: src/gui/setupinputpages.cpp:48
msgid "Move"
msgstr "Движение"
@@ -1919,8 +1939,8 @@ msgstr "Движение"
#. TRANSLATORS: talk with npc
#. TRANSLATORS: input action name
#. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:152
msgid "Talk"
msgstr "Разговор"
@@ -1934,11 +1954,11 @@ msgstr "Разговор"
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
#. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:282 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
+#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
+#: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
msgid "Buy"
msgstr "Купить"
@@ -1952,11 +1972,11 @@ msgstr "Купить"
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
#. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
#: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
#: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:155
+#: src/gui/windows/shopwindow.cpp:164 src/input/pages/basic.cpp:256
+#: src/resources/db/npcdb.cpp:156
msgid "Sell"
msgstr "Продать"
@@ -1964,26 +1984,26 @@ msgstr "Продать"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:295 src/gui/popups/popupmenu.cpp:556
-#: src/gui/popups/popupmenu.cpp:2716
+#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:2699
msgid "Add comment"
msgstr "Добавить комментарий"
#. TRANSLATORS: remove monster from attack list
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:321
+#: src/gui/popups/popupmenu.cpp:313
msgid "Remove from attack list"
msgstr "Удалить из списка атаки"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:328
+#: src/gui/popups/popupmenu.cpp:320
msgid "Add to priority attack list"
msgstr "Добавить в приоритетный список"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:324
msgid "Add to attack list"
msgstr "Добавить в список атаки"
@@ -1991,19 +2011,19 @@ msgstr "Добавить в список атаки"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:336 src/gui/popups/popupmenu.cpp:2738
+#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:2721
msgid "Add to ignore list"
msgstr "Добавить в список игнорирования"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:346 src/gui/popups/popupmenu.cpp:363
+#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
msgid "Move to master"
msgstr "Перейти к владельцу"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:351
+#: src/gui/popups/popupmenu.cpp:342
msgid "Fire"
msgstr "Уволить"
@@ -2011,7 +2031,7 @@ msgstr "Уволить"
#. TRANSLATORS: feed homunculus
#. TRANSLATORS: popup menu item
#. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:385
+#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
msgid "Feed"
msgstr "Накормить"
@@ -2021,9 +2041,9 @@ msgstr "Накормить"
#. TRANSLATORS: rename map item
#. TRANSLATORS: character rename button
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:370 src/gui/popups/popupmenu.cpp:396
-#: src/gui/popups/popupmenu.cpp:701 src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/shopwindow.cpp:194
+#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
+#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/windows/shopwindow.cpp:186
msgid "Rename"
msgstr "Переименовать"
@@ -2031,13 +2051,13 @@ msgstr "Переименовать"
#. TRANSLATORS: delete homunculus
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:374 src/gui/popups/popupmenu.cpp:2950
+#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
msgid "Kill"
msgstr "Убить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:379
msgid "Drop loot"
msgstr "Бросить лут"
@@ -2045,8 +2065,8 @@ msgstr "Бросить лут"
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:391 src/gui/windows/equipmentwindow.cpp:73
-#: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:202 src/resources/itemtypemapdata.h:45
#: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
#: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
#: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2058,7 +2078,7 @@ msgstr "Снять"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:410 src/resources/db/petdb.cpp:159
+#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
msgid "Return to egg"
msgstr "Вернут в яйцо"
@@ -2066,39 +2086,39 @@ msgstr "Вернут в яйцо"
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:449 src/gui/popups/popupmenu.cpp:623
+#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
msgid "Add name to chat"
msgstr "Добавить имя в чат"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:499 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
msgid "Players"
msgstr "Игроки"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:568 src/gui/popups/popupmenu.cpp:2657
-#: src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2667
msgid "Kick from party"
msgstr "Выкинуть из группы"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:661 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
msgid "Pick up"
msgstr "Поднять"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:675 src/gui/popups/popupmenu.cpp:1872
-#: src/gui/popups/popupmenu.cpp:1959 src/gui/popups/popupmenu.cpp:2007
-#: src/gui/popups/popupmenu.cpp:2280
+#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
+#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
+#: src/gui/popups/popupmenu.cpp:2265
msgid "Add to chat"
msgstr "Добавить в чат"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:698 src/gui/popups/popupmenu.cpp:734
+#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
msgid "Map Item"
msgstr "Элемент карты"
@@ -2108,28 +2128,28 @@ msgstr "Элемент карты"
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:2212
-#: src/gui/popups/popupmenu.cpp:2248
+#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
+#: src/gui/popups/popupmenu.cpp:2233
msgid "Remove"
msgstr "Удалить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
#. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:711 src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
#: src/net/eathena/skillrecv.cpp:435
msgid "Warp"
msgstr "Прыгнуть"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:747
+#: src/gui/popups/popupmenu.cpp:740
msgid "Move camera"
msgstr "Передвинуть камеру"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:745
msgid "Restore camera"
msgstr "Восстановить камеру"
@@ -2138,77 +2158,77 @@ msgstr "Восстановить камеру"
#. TRANSLATORS: long button name for outfits window.
#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:777 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
+#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr "Наряды"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:780
+#: src/gui/popups/popupmenu.cpp:773
msgid "Clear outfit"
msgstr "Очистить наряд"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:806 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
msgid "Spells"
msgstr "Заклинания"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:809
+#: src/gui/popups/popupmenu.cpp:802
msgid "Edit spell"
msgstr "Изменить заклинание"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:840 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:833 src/gui/windows/npcdialog.cpp:125
msgid "Clear"
msgstr "Очистить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:847
+#: src/gui/popups/popupmenu.cpp:840
msgid "Disable highlight"
msgstr "Отключить уведомление"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:853
+#: src/gui/popups/popupmenu.cpp:846
msgid "Enable highlight"
msgstr "Включить уведомление"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:859
+#: src/gui/popups/popupmenu.cpp:852
msgid "Don't remove name"
msgstr "Не скрывать имя"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:865
+#: src/gui/popups/popupmenu.cpp:858
msgid "Remove name"
msgstr "Скрывать имя"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:871
+#: src/gui/popups/popupmenu.cpp:864
msgid "Enable away"
msgstr "Разрешить режим \"отошел\""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:877
+#: src/gui/popups/popupmenu.cpp:870
msgid "Disable away"
msgstr "Запретить режим \"отошел\""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:884 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/socialwindow.cpp:81
msgid "Leave"
msgstr "Покинуть"
@@ -2218,116 +2238,116 @@ msgstr "Покинуть"
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:889 src/gui/popups/popupmenu.cpp:2324
-#: src/gui/popups/popupmenu.cpp:2368
+#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2353
msgid "Copy to clipboard"
msgstr "Копировать в буфер обмена"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1019
+#: src/gui/popups/popupmenu.cpp:1012
msgid "Change guild position"
msgstr "Сменить позицию в гильдии"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1069
+#: src/gui/popups/popupmenu.cpp:1062
msgid "window"
msgstr "окно"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1098
+#: src/gui/popups/popupmenu.cpp:1091
msgid "Unlock"
msgstr "Разблокировать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1104
+#: src/gui/popups/popupmenu.cpp:1097
msgid "Lock"
msgstr "Заблокировать"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1115
+#: src/gui/popups/popupmenu.cpp:1108
msgid "Show emotes for:"
msgstr "Показывать эмоции для:"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show emotes for player
#. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1119 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
msgid "Player"
msgstr "Игрок"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1123
+#: src/gui/popups/popupmenu.cpp:1116
msgid "Pet"
msgstr "Животное"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show emotes for homuncules
#. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1130 src/gui/userpalette.cpp:201
+#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
msgid "Homunculus"
msgstr "Гомункул"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show emotes for mercenary
#. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1134 src/gui/userpalette.cpp:196
+#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
msgid "Mercenary"
msgstr "Наемник"
#. TRANSLATORS: dialog caption
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1193
+#: src/gui/popups/popupmenu.cpp:1184
msgid "Rename map sign "
msgstr "Переименовать знак на карте "
#. TRANSLATORS: label
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1196
+#: src/gui/popups/popupmenu.cpp:1187
msgid "Name: "
msgstr "Имя: "
#. TRANSLATORS: dialog caption
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1211
+#: src/gui/popups/popupmenu.cpp:1202
msgid "Player comment "
msgstr "Комментарий игрока "
#. TRANSLATORS: label
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1214
+#: src/gui/popups/popupmenu.cpp:1205
msgid "Comment: "
msgstr "Комментарий: "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1748
+#: src/gui/popups/popupmenu.cpp:1737
msgid "Add to trade"
msgstr "Добавить к сделке"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1756
+#: src/gui/popups/popupmenu.cpp:1745
msgid "Add to trade 10"
msgstr "Добавить к сделке 10"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1761
+#: src/gui/popups/popupmenu.cpp:1750
msgid "Add to trade half"
msgstr "Добавить к сделке половину"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1765
+#: src/gui/popups/popupmenu.cpp:1754
msgid "Add to trade all-1"
msgstr "Добавить к торговле все-1"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1758
msgid "Add to trade all"
msgstr "Добавить к торговле все"
@@ -2336,72 +2356,72 @@ msgstr "Добавить к торговле все"
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1777 src/gui/popups/popupmenu.cpp:1955
-#: src/gui/popups/popupmenu.cpp:2002 src/gui/windows/inventorywindow.cpp:268
-#: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:917 src/gui/windows/setupwindow.cpp:103
+#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/windows/inventorywindow.cpp:285
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
msgid "Store"
msgstr "Сохранить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1785
+#: src/gui/popups/popupmenu.cpp:1774
msgid "Store 10"
msgstr "Сохранить 10"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1790
+#: src/gui/popups/popupmenu.cpp:1779
msgid "Store half"
msgstr "Сохранить половину"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1794
+#: src/gui/popups/popupmenu.cpp:1783
msgid "Store all-1"
msgstr "Сохранить все-1"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1798
+#: src/gui/popups/popupmenu.cpp:1787
msgid "Store all"
msgstr "Сохранить все"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1812
+#: src/gui/popups/popupmenu.cpp:1800
msgid "Move to craft..."
msgstr "Поместить в крафт..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1822 src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/windows/inventorywindow.cpp:287
msgid "Retrieve"
msgstr "Получить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1817
msgid "Retrieve 10"
msgstr "Получить 10"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1835
+#: src/gui/popups/popupmenu.cpp:1822
msgid "Retrieve half"
msgstr "Получить половину"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1839
+#: src/gui/popups/popupmenu.cpp:1826
msgid "Retrieve all-1"
msgstr "Забрать все-1"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1843
+#: src/gui/popups/popupmenu.cpp:1830
msgid "Retrieve all"
msgstr "Получить все"
@@ -2412,17 +2432,17 @@ msgstr "Получить все"
#. TRANSLATORS: default use button name
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1909 src/gui/popups/popupmenu.cpp:2810
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:804 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:168 src/gui/windows/skilldialog.cpp:346
-#: src/gui/windows/skilldialog.cpp:525 src/gui/windows/skilldialog.cpp:612
+#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/windows/inventorywindow.cpp:200
+#: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
+#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
#: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
msgid "Use"
msgstr "Использовать"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2004
msgid "Clear drop window"
msgstr "Очистить окно дропов"
@@ -2431,43 +2451,43 @@ msgstr "Очистить окно дропов"
#. TRANSLATORS: hide player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/popups/popupmenu.cpp:2112
-#: src/gui/popups/popupmenu.cpp:2968 src/gui/popups/popupmenu.cpp:2988
-#: src/gui/popups/popupmenu.cpp:3102
+#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
+#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
+#: src/gui/popups/popupmenu.cpp:3085
msgid "Hide"
msgstr "Спрятать"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2057 src/gui/popups/popupmenu.cpp:2119
+#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
msgid "Show"
msgstr "Показать"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2126
+#: src/gui/popups/popupmenu.cpp:2111
msgid "Open yellow bar settings"
msgstr "Открыть настройки желтой панели"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2128
+#: src/gui/popups/popupmenu.cpp:2113
msgid "Reset yellow bar"
msgstr "сбросить настройки"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2132 src/gui/windows/statuswindow.cpp:90
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/windows/statuswindow.cpp:88
msgid "Copy to chat"
msgstr "Скопировать в чат"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2175 src/gui/popups/popupmenu.cpp:2194
+#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
msgid "Move up"
msgstr "Передвинуть выше"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2200
+#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
msgid "Move down"
msgstr "Передвинуть ниже"
@@ -2475,187 +2495,175 @@ msgstr "Передвинуть ниже"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2277 src/gui/popups/popupmenu.cpp:2713
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
msgid "Undress"
msgstr "Раздеть"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2284
msgid "Copy"
msgstr "Копировать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2302
+#: src/gui/popups/popupmenu.cpp:2287
msgid "Paste"
msgstr "Вставить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2321
+#: src/gui/popups/popupmenu.cpp:2306
msgid "Open link"
msgstr "Открыть ссылку"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2339
+#: src/gui/popups/popupmenu.cpp:2324
msgid "Show window"
msgstr "Показать окно"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:2375
msgid "Skill"
msgstr "Навык"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2394
+#: src/gui/popups/popupmenu.cpp:2379
msgid "Set skill level"
msgstr "Выбрать уровень"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: skill level
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2426 src/gui/popups/skillpopup.cpp:128
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:70 src/gui/windows/statuswindow.cpp:268
-#: src/gui/windows/statuswindow.cpp:392
-#, c-format
-msgid "Level: %d"
-msgstr "Уровень: %d"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2431
+#: src/gui/popups/popupmenu.cpp:2416
msgid "Max level"
msgstr "Макс. уровень"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2478 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2553 src/gui/popups/popupmenu.cpp:2571
+#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
msgid "Disregard"
msgstr "Пренебречь"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2481 src/gui/popups/popupmenu.cpp:2517
-#: src/gui/popups/popupmenu.cpp:2556 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
msgid "Ignore"
msgstr "Игнорировать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2484 src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2544
msgid "Black list"
msgstr "Черный список"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
msgid "Set as enemy"
msgstr "Сделать врагом"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2490 src/gui/popups/popupmenu.cpp:2523
-#: src/gui/popups/popupmenu.cpp:2535 src/gui/popups/popupmenu.cpp:2544
-#: src/gui/popups/popupmenu.cpp:2562
+#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
+#: src/gui/popups/popupmenu.cpp:2547
msgid "Erase"
msgstr "Стереть"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:2485
msgid "Be friend"
msgstr "Подружиться"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2511 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/popups/popupmenu.cpp:2550
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
+#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
+#: src/gui/popups/popupmenu.cpp:2553
msgid "Unignore"
msgstr "Не игнорировать"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2587
+#: src/gui/popups/popupmenu.cpp:2572
msgid "Follow"
msgstr "Следовать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2591
+#: src/gui/popups/popupmenu.cpp:2576
msgid "Imitate"
msgstr "Имитировать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2634
+#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
msgid "Buy (?)"
msgstr "Купить (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2622 src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Sell (?)"
msgstr "Продать (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2651 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
msgid "Invite to party"
msgstr "Пригласить в группу"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2701
+#: src/gui/popups/popupmenu.cpp:2685
#, c-format
msgid "Join chat %s"
msgstr "Присоединиться к чату %s"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2693
msgid "Show Items"
msgstr "Показать предметы"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2710
msgid "Remove from pickup list"
msgstr "Удалить из поднятия"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2734
+#: src/gui/popups/popupmenu.cpp:2717
msgid "Add to pickup list"
msgstr "Сделать поднимаемым"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2786
+#: src/gui/popups/popupmenu.cpp:2769
msgid "Unprotect item"
msgstr "Снять защиту"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2795
+#: src/gui/popups/popupmenu.cpp:2778
msgid "Protect item"
msgstr "Поставить защиту"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2825 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:925
+#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/windows/inventorywindow.cpp:893
msgid "Drop..."
msgstr "Бросить..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2811
msgid "Drop all"
msgstr "Бросить все"
@@ -2663,38 +2671,38 @@ msgstr "Бросить все"
#. TRANSLATORS: drop item
#. TRANSLATORS: long button name for drops window.
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2834 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:930
+#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:898
msgid "Drop"
msgstr "Бросить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2845
+#: src/gui/popups/popupmenu.cpp:2828
msgid "GM..."
msgstr "ГМ..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2853
+#: src/gui/popups/popupmenu.cpp:2836
#, c-format
msgid "Show %s"
msgstr "Показать %s"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2857
+#: src/gui/popups/popupmenu.cpp:2840
msgid "Account info"
msgstr "Инф. об аккаунте"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2860
+#: src/gui/popups/popupmenu.cpp:2843
msgid "Level"
msgstr "Уровень"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2863
+#: src/gui/popups/popupmenu.cpp:2846
msgid "Stats"
msgstr "Статы"
@@ -2703,16 +2711,16 @@ msgstr "Статы"
#. TRANSLATORS: long button name for inventory window.
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2866 src/gui/windowmenu.cpp:106
-#: src/gui/windows/inventorywindow.cpp:152
-#: src/resources/inventory/inventory.cpp:330
+#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/windows/inventorywindow.cpp:146
+#: src/resources/inventory/inventory.cpp:328
msgid "Inventory"
msgstr "Инвентарь"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show player storage list
#. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2869 src/resources/inventory/inventory.cpp:335
+#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
msgid "Storage"
msgstr "Хранилище"
@@ -2721,40 +2729,40 @@ msgstr "Хранилище"
#. TRANSLATORS: long button name for cart window.
#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2872 src/gui/windowmenu.cpp:110
-#: src/gui/windows/inventorywindow.cpp:239
-#: src/resources/inventory/inventory.cpp:346
+#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/windows/inventorywindow.cpp:233
+#: src/resources/inventory/inventory.cpp:343
msgid "Cart"
msgstr "Телега"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
#. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2875 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
msgid "Commands"
msgstr "Команды"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2861
msgid "Char commands"
msgstr "Команды игрока"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2881 src/gui/popups/popupmenu.cpp:3083
+#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
msgid "Back"
msgstr "Назад"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2895
+#: src/gui/popups/popupmenu.cpp:2878
msgid "Locate"
msgstr "Определить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2901
+#: src/gui/popups/popupmenu.cpp:2884
msgid "Check ip"
msgstr "Проверить IP"
@@ -2762,7 +2770,7 @@ msgstr "Проверить IP"
#. TRANSLATORS: go to player position
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2905 src/gui/popups/popupmenu.cpp:3113
+#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
msgid "Goto"
msgstr "Перейти"
@@ -2770,109 +2778,109 @@ msgstr "Перейти"
#. TRANSLATORS: recall player to current position
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2908 src/gui/popups/popupmenu.cpp:3107
+#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
msgid "Recall"
msgstr "Вызвать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2923
+#: src/gui/popups/popupmenu.cpp:2906
msgid "Recall party"
msgstr "Призвать группу"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:2913
msgid "Recall guild"
msgstr "Призвать гильдию"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2941
+#: src/gui/popups/popupmenu.cpp:2924
msgid "Give party leader"
msgstr "Установить лидера группы"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2956
+#: src/gui/popups/popupmenu.cpp:2939
msgid "Show..."
msgstr "Показать..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:2942
msgid "Mute..."
msgstr "Заглушить..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2979
+#: src/gui/popups/popupmenu.cpp:2962
msgid "Immortal"
msgstr "Безсмертие"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2982
+#: src/gui/popups/popupmenu.cpp:2965
msgid "Jail"
msgstr "В тюрьму"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2985
+#: src/gui/popups/popupmenu.cpp:2968
msgid "Unjail"
msgstr "Из тюрьмы"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2992
+#: src/gui/popups/popupmenu.cpp:2975
msgid "Killer"
msgstr "Убийца"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2995
+#: src/gui/popups/popupmenu.cpp:2978
msgid "Killable"
msgstr "Убиваемый"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2998
+#: src/gui/popups/popupmenu.cpp:2981
msgid "Set save"
msgstr "Установить тчк. сохранения"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:2984
msgid "Warp to save"
msgstr "Телепорт в тчк. сохранение"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:3004
+#: src/gui/popups/popupmenu.cpp:2987
msgid "Warp to random"
msgstr "Случайный телепорт"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:3008
+#: src/gui/popups/popupmenu.cpp:2991
msgid "Spawn clone"
msgstr "Создать клона"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:3011
+#: src/gui/popups/popupmenu.cpp:2994
msgid "Spawn slave clone"
msgstr "Создать подчиненного клона"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:3014
+#: src/gui/popups/popupmenu.cpp:2997
msgid "Spawn evil clone"
msgstr "Создать злого клона"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3018
+#: src/gui/popups/popupmenu.cpp:3001
msgid "Break guild"
msgstr "Разрушить гильдию"
@@ -2880,31 +2888,31 @@ msgstr "Разрушить гильдию"
#. TRANSLATORS: kick player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3025 src/gui/popups/popupmenu.cpp:3096
-#: src/gui/popups/popupmenu.cpp:3125
+#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
+#: src/gui/popups/popupmenu.cpp:3108
msgid "Kick"
msgstr "Кикнуть"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3033
+#: src/gui/popups/popupmenu.cpp:3016
#, c-format
msgid "Mute %s"
msgstr "Заглушить %s"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3041 src/gui/popups/popupmenu.cpp:3045
-#: src/gui/popups/popupmenu.cpp:3049 src/gui/popups/popupmenu.cpp:3053
-#: src/gui/popups/popupmenu.cpp:3057
+#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
+#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
+#: src/gui/popups/popupmenu.cpp:3040
#, c-format
msgid "Mute %d"
msgstr "Приглушить %d"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3062 src/gui/popups/popupmenu.cpp:3066
-#: src/gui/popups/popupmenu.cpp:3070 src/gui/popups/popupmenu.cpp:3074
-#: src/gui/popups/popupmenu.cpp:3078
+#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
+#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
+#: src/gui/popups/popupmenu.cpp:3061
#, c-format
msgid "Unmute %d"
msgstr "Убрать пришлушение %d"
@@ -2913,19 +2921,19 @@ msgstr "Убрать пришлушение %d"
#. TRANSLATORS: disguise to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3110 src/gui/popups/popupmenu.cpp:3137
+#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
msgid "Disguise"
msgstr "Превратиться"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3128
+#: src/gui/popups/popupmenu.cpp:3111
msgid "Spawn same"
msgstr "Создать копию"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3134
+#: src/gui/popups/popupmenu.cpp:3117
msgid "Spawn slave"
msgstr "Создать подчиненного"
@@ -2937,8 +2945,8 @@ msgstr "Создать подчиненного"
#. TRANSLATORS: info message header
#. TRANSLATORS: info header
#. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3141 src/gui/popups/popupmenu.cpp:3160
-#: src/gui/popups/popupmenu.cpp:3173 src/gui/windows/charselectdialog.cpp:76
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
+#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
#: src/net/eathena/charserverrecv.cpp:455
msgid "Info"
@@ -2946,49 +2954,49 @@ msgstr "Сведения"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3127
msgid "Search"
msgstr "Поиск"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3148
+#: src/gui/popups/popupmenu.cpp:3131
msgid "Search spawns"
msgstr "Поиск мест создания"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3163 src/gui/popups/popupmenu.cpp:3176
+#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
msgid "Who drops"
msgstr "Кто бросает"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3183
+#: src/gui/popups/popupmenu.cpp:3166
msgid "GM commands"
msgstr "Коменды ГМ"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3239
#, c-format
msgid "Move to craft %d"
msgstr "Поместить в крафт %d"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3275
+#: src/gui/popups/popupmenu.cpp:3256
msgid "Mail to..."
msgstr "Послать письмо..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3286
+#: src/gui/popups/popupmenu.cpp:3265
msgid "Taming pet"
msgstr "Ловить животное"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3297
+#: src/gui/popups/popupmenu.cpp:3274
msgid "Adopt child"
msgstr "Принять ребенка"
@@ -3004,7 +3012,8 @@ msgid "Level: Unknown"
msgstr "Уровень: Неизвестно"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:46
+#. TRANSLATORS: status window tab name
+#: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
msgid "Basic"
msgstr "Основное"
@@ -3025,7 +3034,7 @@ msgstr "Окна"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: inventory type name
-#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:356
+#: src/gui/setupinputpages.cpp:54 src/resources/inventory/inventory.cpp:353
msgid "Craft"
msgstr "Крафт"
@@ -3052,7 +3061,7 @@ msgstr "Чат"
#. TRANSLATORS: register dialog. button.
#. TRANSLATORS: input action group
#. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:390
+#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:440
#: src/gui/widgets/tabs/setup_audio.cpp:155
#: src/gui/widgets/tabs/setup_chat.cpp:294
#: src/gui/widgets/tabs/setup_other.cpp:357
@@ -3068,266 +3077,333 @@ msgid "Gui"
msgstr "Интерфейс"
#. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:138
msgid "Beings"
msgstr "Сущности"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:143
msgid "Being"
msgstr "Существо"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:148
msgid "Friend names"
msgstr "Имена друзей"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:153
msgid "Disregarded names"
msgstr "Имена пренебрегаемых"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:158
msgid "Ignored names"
msgstr "Имена игнорируемых"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:163
msgid "Erased names"
msgstr "Имена стертых"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:173
msgid "Other players names"
msgstr "Имена других игроков"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:171
+#: src/gui/userpalette.cpp:178
msgid "Own name"
msgstr "Собственное имя"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:183
msgid "GM names"
msgstr "Имена ГМ"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:181
+#: src/gui/userpalette.cpp:188
msgid "NPCs"
msgstr "Боты"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:186 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:193 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr "Монстры"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:198
msgid "Pets"
msgstr "Питомцы"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
+#: src/gui/userpalette.cpp:213
msgid "Skill unit"
msgstr "Объект скила"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:211
+#: src/gui/userpalette.cpp:218
msgid "Party members"
msgstr "Члены группы"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:223
msgid "Guild members"
msgstr "Члены гильдии"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:221 src/gui/userpalette.cpp:226
-#: src/gui/userpalette.cpp:231
+#: src/gui/userpalette.cpp:228 src/gui/userpalette.cpp:233
+#: src/gui/userpalette.cpp:238
#, c-format
msgid "Team %d"
msgstr "Команда: %d"
#. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:234
+#: src/gui/userpalette.cpp:241
msgid "Particles"
msgstr "Частицы"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:239 src/gui/widgets/tabs/setup_visual.cpp:163
+#: src/gui/userpalette.cpp:246 src/gui/widgets/tabs/setup_visual.cpp:163
msgid "Particle effects"
msgstr "Эффекты частиц"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:244
+#: src/gui/userpalette.cpp:251
msgid "Pickup notification"
msgstr "Сообщение о подборе предмета"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:249
+#: src/gui/userpalette.cpp:256
msgid "Exp notification"
msgstr "Сообщение об изменении опыта"
#. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:252
+#: src/gui/userpalette.cpp:259
msgid "Hp bars"
msgstr "Панели здоровья"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:257
+#: src/gui/userpalette.cpp:264
msgid "Player HP bar"
msgstr "Полоса жизни игрока"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:262
+#: src/gui/userpalette.cpp:269
msgid "Player HP bar (second color)"
msgstr "Полоса жизни игрока (второй цвет)"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:268
+#: src/gui/userpalette.cpp:275
msgid "Monster HP bar"
msgstr "Полоса жизни монстров"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:274
+#: src/gui/userpalette.cpp:281
msgid "Monster HP bar (second color)"
msgstr "Полоса жизни монстров (второй цвет)"
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:287
+#, fuzzy
+msgid "Homunculus HP bar"
+msgstr "Гомункул"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:293
+#, fuzzy
+msgid "Homunculus HP bar (second color)"
+msgstr "Полоса жизни монстров (второй цвет)"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:299
+#, fuzzy
+msgid "Mercenary HP bar"
+msgstr "Наемник"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:305
+#, fuzzy
+msgid "Mercenary HP bar (second color)"
+msgstr "Полоса жизни монстров (второй цвет)"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:312
+#, fuzzy
+msgid "Elemental HP bar"
+msgstr "Полоса жизни игрока"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:318
+#, fuzzy
+msgid "Elemental HP bar (second color)"
+msgstr "Полоса жизни игрока (второй цвет)"
+
#. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:278
+#: src/gui/userpalette.cpp:322
msgid "Hits"
msgstr "Попадания"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:283
+#: src/gui/userpalette.cpp:327
msgid "Player hits monster"
msgstr "Удар игрока по монстру"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:288
+#: src/gui/userpalette.cpp:332
msgid "Monster hits player"
msgstr "Удар монстра по игроку"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:293
+#: src/gui/userpalette.cpp:337
msgid "Other player hits local player"
msgstr "Удар другого игрока по локальному игроку"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:298
+#: src/gui/userpalette.cpp:342
msgid "Critical Hit"
msgstr "Критический удар"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:303
+#: src/gui/userpalette.cpp:347
msgid "Local player hits monster"
msgstr "Удар игрока по монстру"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:308
+#: src/gui/userpalette.cpp:352
msgid "Local player critical hit"
msgstr "Критический удар игрока"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:313
+#: src/gui/userpalette.cpp:357
msgid "Local player miss"
msgstr "Промах локального игрока"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:317
+#: src/gui/userpalette.cpp:361
msgid "Misses"
msgstr "Промахи"
#. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:320
+#: src/gui/userpalette.cpp:364
msgid "Tiles"
msgstr "Тайлы"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:325
+#: src/gui/userpalette.cpp:369
msgid "Portal highlight"
msgstr "Подсветка переходов"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:330
+#: src/gui/userpalette.cpp:374
msgid "Default collision highlight"
msgstr "Подсветка непроходимых клеток"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:336
+#: src/gui/userpalette.cpp:380
msgid "Air collision highlight"
msgstr "Подсветка только воздушных клеток"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:342
+#: src/gui/userpalette.cpp:386
msgid "Water collision highlight"
msgstr "Подсветка клеток с водой"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:348
+#: src/gui/userpalette.cpp:392
+#, fuzzy
+msgid "Monster collision highlight"
+msgstr "Подсветка клеток с водой"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:398
msgid "Special ground collision highlight"
msgstr "Подсветка спец. областей"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:354
+#: src/gui/userpalette.cpp:404
msgid "Walkable highlight"
msgstr "Подсветка доступных клеток карты"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:360
+#: src/gui/userpalette.cpp:410
msgid "Tiles border"
msgstr "Бордюр тайлов"
#. TRANSLATORS: palette label
-#: src/gui/userpalette.cpp:363
+#: src/gui/userpalette.cpp:413
msgid "Ranges"
msgstr "Расстояния"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:368
+#: src/gui/userpalette.cpp:418
msgid "Local player attack range"
msgstr "Подсветка радиуса атаки игрока"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:374
+#: src/gui/userpalette.cpp:424
msgid "Local player attack range border"
msgstr "Подсветка границы атаки игрока"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:380
+#: src/gui/userpalette.cpp:430
msgid "Monster attack range"
msgstr "Зона атаки монстра"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:386
+#: src/gui/userpalette.cpp:436
msgid "Skill attack range border"
msgstr "Граница атаки навыка"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:395
+#: src/gui/userpalette.cpp:445
msgid "Floor item amount color"
msgstr "Цвет кол-ва предметов на земле"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:401
+#: src/gui/userpalette.cpp:451
msgid "Home place"
msgstr "Домашняя позиция"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:407
+#: src/gui/userpalette.cpp:457
msgid "Home place border"
msgstr "Граница домашней позиции"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:413
+#: src/gui/userpalette.cpp:463
msgid "Road point"
msgstr "Точка дороги"
+#. TRANSLATORS: status window label
+#. TRANSLATORS: status bar label
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: buy dialog button
+#. TRANSLATORS: status bar label
+#: src/gui/widgets/attrs/changedisplay.cpp:48
+#: src/gui/widgets/attrs/changedisplay.cpp:70
+#: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:295
+#: src/gui/windows/statuswindow.cpp:434 src/gui/windows/statuswindow.cpp:490
+msgid "Max"
+msgstr "Макс"
+
+#. TRANSLATORS: status window label (plus sign)
+#. TRANSLATORS: sell dialog button
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: npc dialog button
+#: src/gui/widgets/attrs/changedisplay.cpp:50
+#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:224 src/gui/windows/npcdialog.cpp:121
+msgid "+"
+msgstr "+"
+
#. TRANSLATORS: character level
-#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/widgets/characterdisplay.cpp:138
#, c-format
msgid "Level: %u"
msgstr "Уровень: %u"
@@ -3335,15 +3411,15 @@ msgstr "Уровень: %u"
#. TRANSLATORS: character money
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
-#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
+#: src/gui/widgets/characterdisplay.cpp:142
+#: src/gui/windows/inventorywindow.cpp:699 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:209 src/gui/windows/statuswindow.cpp:349
#, c-format
msgid "Money: %s"
msgstr "Деньги: %s"
#. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:366 src/gui/widgets/itemcontainer.cpp:488
msgid "Eq."
msgstr "Од."
@@ -3363,9 +3439,9 @@ msgstr "Открыть ссылку"
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
-#: src/gui/windows/serverdialog.cpp:114 src/gui/windows/shopwindow.cpp:126
+#: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:281
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/serverdialog.cpp:108 src/gui/windows/shopwindow.cpp:118
#: src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Добавить"
@@ -3377,52 +3453,28 @@ msgstr "Добавить"
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
+#: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:293
#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
-#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:110
+#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:104
#: src/gui/windows/textselectdialog.cpp:91 src/input/pages/basic.cpp:226
msgid "Quit"
msgstr "Выход"
#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: npc dialog button
-#. TRANSLATORS: status window label (plus sign)
-#: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:194
-#: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:771
-msgid "+"
-msgstr "+"
-
-#. TRANSLATORS: sell dialog button
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:227 src/gui/windows/npcdialog.cpp:125
+#: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:278
+#: src/gui/windows/itemamountwindow.cpp:186
+#: src/gui/windows/itemamountwindow.cpp:221 src/gui/windows/npcdialog.cpp:123
msgid "-"
msgstr "-"
-#. TRANSLATORS: sell dialog button
-#. TRANSLATORS: buy dialog button
-#. TRANSLATORS: status bar label
-#. TRANSLATORS: status window label
-#. TRANSLATORS: status bar label
-#: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
-#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
-msgid "Max"
-msgstr "Макс"
-
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:140 src/gui/widgets/selldialog.cpp:357
-#: src/gui/windows/buydialog.cpp:265 src/gui/windows/buydialog.cpp:687
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:673
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Цена: %s / Всего: %s"
@@ -3430,10 +3482,16 @@ msgstr "Цена: %s / Всего: %s"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:370 src/gui/widgets/setupitem.cpp:508
-#: src/gui/windows/serverdialog.cpp:116
+#: src/gui/windows/serverdialog.cpp:110
msgid "Edit"
msgstr "Изменить"
+#. TRANSLATORS: status window label
+#: src/gui/widgets/statspagebasic.cpp:67 src/gui/widgets/statspagebasic.cpp:98
+#, c-format
+msgid "Character points: %d"
+msgstr "Очки персонажа: %d"
+
#. TRANSLATORS: battle chat tab name
#: src/gui/widgets/tabs/chat/battletab.cpp:35
msgid "Battle"
@@ -3502,15 +3560,13 @@ msgstr "Обмен предметами включен."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
msgid "Item sharing disabled."
msgstr "Обмен предметами выключен."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
msgid "Item sharing not possible."
msgstr "Обмен предметами невозможен."
@@ -3521,22 +3577,19 @@ msgstr "Статус обмена предметами неизвестен."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
msgid "Experience sharing enabled."
msgstr "Обмен опытом включен."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
msgid "Experience sharing disabled."
msgstr "Обмен опытом выключен."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
msgid "Experience sharing not possible."
msgstr "Обмен опытом невозможен."
@@ -3965,7 +4018,10 @@ msgid ""
"Chat window will be automatically hidden when not in use.\n"
"\n"
"Hit Enter or hover mouse to show chat again."
-msgstr "Окно чата будет автоматически скрыто, когда не используется.\n\nНажмите Enter или наведите курсор, чтобы показать чат снова."
+msgstr ""
+"Окно чата будет автоматически скрыто, когда не используется.\n"
+"\n"
+"Нажмите Enter или наведите курсор, чтобы показать чат снова."
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -3977,15 +4033,19 @@ msgstr "Защитить фокус чата"
msgid ""
"Enables aggressive protection of input focus in chat window.\n"
"\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
-msgstr "Включает принудительную защиту ввода в окне чата.\n\nПримечание: другие текстовые поля будут недоступны для ввода пока Вы набираете текст в окне чата."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
+msgstr ""
+"Включает принудительную защиту ввода в окне чата.\n"
+"\n"
+"Примечание: другие текстовые поля будут недоступны для ввода пока Вы "
+"набираете текст в окне чата."
#. TRANSLATORS: settings group
#. TRANSLATORS: settings colors tab name
#. TRANSLATORS: emotes tab name
#: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
msgid "Colors"
msgstr "Цвета"
@@ -3999,7 +4059,9 @@ msgstr "Удалить цвета из полученных сообщений
msgid ""
"Enable this setting to strip colors from incoming chat messages. All "
"messages will use default chat text color if this enabled."
-msgstr "Отключает цветные сообщения чата. Если опция включена, все сообщения будут такого же цвета как и основной текст чата."
+msgstr ""
+"Отключает цветные сообщения чата. Если опция включена, все сообщения будут "
+"такого же цвета как и основной текст чата."
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4009,9 +4071,11 @@ msgstr "Показать список цветов чата"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:79
msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
"\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
msgstr ""
#. TRANSLATORS: settings option
@@ -4023,7 +4087,8 @@ msgstr "Разрешить магические и администраторс
#: src/gui/widgets/tabs/setup_chat.cpp:92
msgid ""
"Enable this setting to be able to type spells and GM commands in any tab."
-msgstr "Включите эту опцию, чтобы писать заклинания и GM команды в любой вкладке."
+msgstr ""
+"Включите эту опцию, чтобы писать заклинания и GM команды в любой вкладке."
#. TRANSLATORS: settings group
#: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4038,9 +4103,11 @@ msgstr "Ограничить число символов в строке чат
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:103
msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
"\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
msgstr ""
#. TRANSLATORS: settings option
@@ -4051,7 +4118,9 @@ msgstr "Ограничить число строк в чате"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:112
msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
"\n"
"Note: keeping too many lines in scroll buffer can slow client down."
msgstr ""
@@ -4092,8 +4161,8 @@ msgstr "Показать историю чата"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:139
msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
msgstr ""
#. TRANSLATORS: settings option
@@ -4104,9 +4173,11 @@ msgstr "Показывать информацию о подключениях в
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:146
msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
"\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
msgstr ""
#. TRANSLATORS: settings option
@@ -4117,9 +4188,11 @@ msgstr "Показывать информацию о подключениях в
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:154
msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
"\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
msgstr ""
#. TRANSLATORS: settings group
@@ -4135,9 +4208,13 @@ msgstr "Скрыть сообщения магазина"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:166
msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
"\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
msgstr ""
#. TRANSLATORS: settings option
@@ -4150,7 +4227,8 @@ msgstr "Показывать MVP сообщения"
msgid ""
"Enable this setting to see MVP messages from server.\n"
"\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
msgstr ""
#. TRANSLATORS: settings group
@@ -4169,9 +4247,12 @@ msgstr "Личные сообщения во вкладках"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:189
msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
"\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
msgstr ""
#. TRANSLATORS: settings option
@@ -4182,7 +4263,8 @@ msgstr "Оставлять сообщения магии на вкладке о
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:199
msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
"\n"
"Note: it does not affects server replies related to spells."
msgstr ""
@@ -4195,9 +4277,11 @@ msgstr "Показывать сообщения сервера на вкладк
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:207
msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
"\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
msgstr ""
#. TRANSLATORS: settings option
@@ -4222,9 +4306,11 @@ msgstr "Включить страницу чата для гм"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:226
msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
"\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
msgstr ""
#. TRANSLATORS: settings option
@@ -4235,7 +4321,8 @@ msgstr "Включить в чате закладку для языка"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:234
msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
"\n"
"Note: only supported by Evol server yet."
msgstr ""
@@ -4248,7 +4335,9 @@ msgstr "Показывать сообщения на всех языках"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:242
msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
"\n"
"Note: it only works on servers supporting language tabs feature, like Evol."
msgstr ""
@@ -4261,7 +4350,9 @@ msgstr "Включить вкладку боя"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:252
msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
"\n"
"Note: client restart required to take effect."
msgstr ""
@@ -4287,7 +4378,10 @@ msgstr "Подгонять размер чата"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:269
msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
"\n"
"Note: its mostly about jumpy attitude vs less usable space for text."
msgstr ""
@@ -4322,7 +4416,8 @@ msgstr "Подсвечиваемые слова (разделенные запя
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:299
msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
"\n"
"Note: frequent highlights are annoying - use it with caution."
msgstr ""
@@ -4335,7 +4430,8 @@ msgstr "Игнорировать глобальные сообщения с им
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:307
msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
"\n"
"Note: careless use of this feature can make you to miss important announces!"
msgstr ""
@@ -4348,9 +4444,12 @@ msgstr "Показывать кнопку эмоций в чате"
#. TRANSLATORS: settings description
#: src/gui/widgets/tabs/setup_chat.cpp:316
msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
"\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
msgstr ""
#. TRANSLATORS: settings option
@@ -4363,7 +4462,9 @@ msgstr "Показывать motd сообщение сервера"
msgid ""
"If this setting enabled, client will display server MOTD (message of the "
"day) once you connect to server. Disable it to hide MOTD."
-msgstr "Если включена эта опция, то при подключении к серверу будет отображаться MOTD - сообщение/совет дня. Отключите, чтобы не показывать MOTD."
+msgstr ""
+"Если включена эта опция, то при подключении к серверу будет отображаться "
+"MOTD - сообщение/совет дня. Отключите, чтобы не показывать MOTD."
#. TRANSLATORS: color selection preview message
#: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4377,7 +4478,7 @@ msgstr "Введите:"
#. TRANSLATORS: colors tab. label.
#: src/gui/widgets/tabs/setup_colors.cpp:69
-#: src/gui/widgets/tabs/setup_colors.cpp:364
+#: src/gui/widgets/tabs/setup_colors.cpp:372
msgid "Delay:"
msgstr "Задержка:"
@@ -4398,33 +4499,33 @@ msgstr "Синий:"
#. TRANSLATORS: color type
#: src/gui/widgets/tabs/setup_colors.cpp:105
-#: src/gui/widgets/tabs/setup_colors.cpp:435
+#: src/gui/widgets/tabs/setup_colors.cpp:443
msgid "Static"
msgstr "Статичный"
#. TRANSLATORS: color type
#: src/gui/widgets/tabs/setup_colors.cpp:109
#: src/gui/widgets/tabs/setup_colors.cpp:112
-#: src/gui/widgets/tabs/setup_colors.cpp:437
+#: src/gui/widgets/tabs/setup_colors.cpp:445
msgid "Pulse"
msgstr "Пульсирующий"
#. TRANSLATORS: color type
#: src/gui/widgets/tabs/setup_colors.cpp:115
#: src/gui/widgets/tabs/setup_colors.cpp:118
-#: src/gui/widgets/tabs/setup_colors.cpp:439
+#: src/gui/widgets/tabs/setup_colors.cpp:447
msgid "Rainbow"
msgstr "Радуга"
#. TRANSLATORS: color type
#: src/gui/widgets/tabs/setup_colors.cpp:121
#: src/gui/widgets/tabs/setup_colors.cpp:124
-#: src/gui/widgets/tabs/setup_colors.cpp:439
+#: src/gui/widgets/tabs/setup_colors.cpp:447
msgid "Spectrum"
msgstr "Спектр"
#. TRANSLATORS: colors tab. label.
-#: src/gui/widgets/tabs/setup_colors.cpp:358
+#: src/gui/widgets/tabs/setup_colors.cpp:366
msgid "Alpha:"
msgstr "Прозрачность:"
@@ -4464,7 +4565,9 @@ msgstr "Обнаружен(ы) конфликт(ы) клавиш."
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
"strange behaviour."
-msgstr "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно вести."
+msgstr ""
+"Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
+"вести."
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
@@ -4635,8 +4738,8 @@ msgstr "Прокручивать прицел по монстрам"
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
#: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:61
-#: src/gui/windows/minimap.cpp:124
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:63
+#: src/gui/windows/minimap.cpp:126
msgid "Map"
msgstr "Карта"
@@ -4811,7 +4914,7 @@ msgstr "Включить напоминание о весе"
#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:280 src/gui/windowmenu.cpp:150
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windows/inventorywindow.cpp:235
msgid "Shop"
msgstr "Магазин"
@@ -4827,7 +4930,7 @@ msgstr "Включить режим магазина"
#. TRANSLATORS: settings group
#. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:97
msgid "NPC"
msgstr "NPC"
@@ -5012,7 +5115,9 @@ msgstr "Аппаратное ускорение"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_perfomance.cpp:74
msgid "Enable opacity cache (Software, can use much memory)"
-msgstr "Включить кеш прозрачности (программный режим, может использовать много памяти)"
+msgstr ""
+"Включить кеш прозрачности (программный режим, может использовать много "
+"памяти)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5042,7 +5147,9 @@ msgstr "Улучшение качества (выключите для лучш
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_perfomance.cpp:101
msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr "Включить исправление альфа канала (программный режим, может быть очень медленным)"
+msgstr ""
+"Включить исправление альфа канала (программный режим, может быть очень "
+"медленным)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_perfomance.cpp:106
@@ -5057,7 +5164,8 @@ msgstr "Включить перестановку спрайтов (нужен
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_perfomance.cpp:115
msgid "Small memory (enable for lower memory usage)"
-msgstr "Уменьшенное потребление памяти (включите для меньшего потребления памяти)"
+msgstr ""
+"Уменьшенное потребление памяти (включите для меньшего потребления памяти)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_perfomance.cpp:120
@@ -5072,7 +5180,8 @@ msgstr "Выключить кеширование сущностей (прогр
#. TRANSLATORS: settings group
#: src/gui/widgets/tabs/setup_perfomance.cpp:129
msgid "Different options (enable or disable can improve performance)"
-msgstr "Разные настройки (включение или выключение может улучшить производительность)"
+msgstr ""
+"Разные настройки (включение или выключение может улучшить производительность)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5107,7 +5216,8 @@ msgstr "Кешировать все звуки (может использова
#. TRANSLATORS: settings group
#: src/gui/widgets/tabs/setup_perfomance.cpp:160
msgid "Critical options (DO NOT change if you don't know what you're doing)"
-msgstr "Очень важные настройки (НЕ МЕНЯЙТЕ если вы не уверены в том, что вы делаете)"
+msgstr ""
+"Очень важные настройки (НЕ МЕНЯЙТЕ если вы не уверены в том, что вы делаете)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_perfomance.cpp:164
@@ -5268,9 +5378,9 @@ msgstr "Разрешить шептание"
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:78
-#: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:128
-#: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
+#: src/gui/windows/charselectdialog.cpp:76 src/gui/windows/mailwindow.cpp:66
+#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:120
+#: src/gui/windows/textcommandeditor.cpp:102 src/input/pages/gui.cpp:109
msgid "Delete"
msgstr "Удалить"
@@ -5512,13 +5622,17 @@ msgstr "Нет"
#: src/gui/widgets/tabs/setup_video.cpp:233
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Не удалось переключиться в оконный режим. Восстановить старый режим также не удалось!"
+msgstr ""
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
+"удалось!"
#. TRANSLATORS: video error message
#: src/gui/widgets/tabs/setup_video.cpp:240
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Не удалось переключиться в полноэкранный режим. Восстановить старый режим также не удалось!"
+msgstr ""
+"Не удалось переключиться в полноэкранный режим. Восстановить старый режим "
+"также не удалось!"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5559,7 +5673,9 @@ msgstr "Разрешение экрана изменено"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_video.cpp:401
msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем разрешении."
+msgstr ""
+"Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
+"разрешении."
#. TRANSLATORS: speach type
#: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -5930,7 +6046,7 @@ msgstr "СН"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:237
msgid "Equipment"
msgstr "Снаряжение"
@@ -5956,7 +6072,7 @@ msgstr "УМ"
#. TRANSLATORS: long button name for skills window.
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:85
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
msgid "Skills"
msgstr "Навыки"
@@ -6036,7 +6152,7 @@ msgstr "ПО"
#. TRANSLATORS: mail window name
#. TRANSLATORS: inventory type name
#: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/resources/inventory/inventory.cpp:351
+#: src/resources/inventory/inventory.cpp:348
msgid "Mail"
msgstr "Почта"
@@ -6080,12 +6196,12 @@ msgid "Deposit"
msgstr "Положить"
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:176
+#: src/gui/windows/buydialog.cpp:172
msgid "Create items"
msgstr "Создание предметов"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:274
+#: src/gui/windows/buydialog.cpp:270
msgid "Amount:"
msgstr "Количество:"
@@ -6093,14 +6209,13 @@ msgstr "Количество:"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
+#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
msgid "Create"
msgstr "Создать"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/buydialog.cpp:332
msgid "Filter:"
msgstr "Фильтр:"
@@ -6151,10 +6266,8 @@ msgstr "Изменить пароль"
#. TRANSLATORS: change password dialog label
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
-#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
#: src/gui/windows/logindialog.cpp:110 src/gui/windows/registerdialog.cpp:75
-#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Пароль:"
@@ -6214,8 +6327,7 @@ msgstr "^"
#: src/gui/windows/charcreatedialog.cpp:196
#: src/gui/windows/charcreatedialog.cpp:209
#: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
msgid ">"
msgstr ">"
@@ -6233,8 +6345,7 @@ msgstr "Распределите очки (%d)"
#: src/gui/windows/charcreatedialog.cpp:200
#: src/gui/windows/charcreatedialog.cpp:211
#: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
msgid "<"
msgstr "<"
@@ -6260,8 +6371,7 @@ msgstr "Внешность:"
#. TRANSLATORS: one char size female character gender
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
msgid "F"
msgstr "Д"
@@ -6276,7 +6386,7 @@ msgstr "М"
#. TRANSLATORS: inventory outfits button
#: src/gui/windows/charcreatedialog.cpp:259
#: src/gui/windows/charcreatedialog.cpp:276
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:217
msgid "O"
msgstr "Н"
@@ -6312,47 +6422,47 @@ msgid "Are you sure you want to delete this character?"
msgstr "Вы уверены, что хотите удалить этого персонажа?"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:60
+#: src/gui/windows/charselectdialog.cpp:58
#, 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:67
msgid "Switch"
msgstr "Сменить"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
+#: src/gui/windows/charselectdialog.cpp:69
msgid "Password"
msgstr "Пароль"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:74
-#: src/gui/windows/charselectdialog.cpp:608
+#: src/gui/windows/charselectdialog.cpp:72
+#: src/gui/windows/charselectdialog.cpp:599
#: src/gui/windows/updaterwindow.cpp:192
msgid "Play"
msgstr "Играть"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:143
+#: src/gui/windows/charselectdialog.cpp:141
#, c-format
msgid "Account %s"
msgstr "Аккаунт %s"
#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:173
+#: src/gui/windows/charselectdialog.cpp:170
msgid "Please set new pincode"
msgstr "Пожалуйста, установите новый пин код"
#. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:224
+#: src/gui/windows/charselectdialog.cpp:220
msgid "Please enter new name"
msgstr "Пожалуйста, введите новое имя"
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:244
+#: src/gui/windows/charselectdialog.cpp:240
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -6360,30 +6470,35 @@ msgid ""
"Level: %u\n"
"Experience: %u\n"
"Money: %s"
-msgstr "Hp: %u/%u\nMp: %u/%u\nУровень: %u\nОпыт: %u\nДеньги: %s"
+msgstr ""
+"Hp: %u/%u\n"
+"Mp: %u/%u\n"
+"Уровень: %u\n"
+"Опыт: %u\n"
+"Деньги: %s"
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:308
+#: src/gui/windows/charselectdialog.cpp:299
msgid "Incorrect password"
msgstr "Неправильный пароль"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:459
+#: src/gui/windows/charselectdialog.cpp:450
msgid "Enter your email for deleting character"
msgstr "Введите ваш email для удаления персонажа"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:461
+#: src/gui/windows/charselectdialog.cpp:452
msgid "Enter email:"
msgstr "Введите email:"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:459
msgid "Enter password for deleting character"
msgstr "Введите пароль для удаления персонажа"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:470
+#: src/gui/windows/charselectdialog.cpp:461
msgid "Enter password:"
msgstr "Введите пароль:"
@@ -6462,8 +6577,7 @@ msgstr "Редактирование сервера"
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
msgid "Connect"
msgstr "Соединиться"
@@ -6503,7 +6617,7 @@ msgid "Packet version:"
msgstr "Версия пакетов:"
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:214
+#: src/gui/windows/editserverdialog.cpp:206
msgid "Please at least type both the address and the port of the server."
msgstr "Пожалуйста введите хотя бы адрес и порт сервера."
@@ -6532,8 +6646,8 @@ msgstr "Шрифты"
#. TRANSLATORS: unknown equipment page name
#. TRANSLATORS: unknown hosts group name
#. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:680
-#: src/gui/windows/serverdialog.cpp:461 src/resources/skill/skillinfo.cpp:120
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:118
msgid "Unknown"
msgstr "Неизвестный"
@@ -6565,7 +6679,7 @@ msgstr "Вставка"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:204 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:198 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
#: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
#: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6577,93 +6691,93 @@ msgid "Equip"
msgstr "Надеть"
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:219
msgid "C"
msgstr "П"
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:221
msgid "S"
msgstr "М"
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:223
msgid "E"
msgstr "С"
#. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1066
+#: src/gui/windows/inventorywindow.cpp:1029
msgid "Insert card request"
msgstr "Вопрос о вставке карты"
#. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1068
+#: src/gui/windows/inventorywindow.cpp:1031
#, c-format
msgid "Insert %s into %s?"
msgstr "Вставить %s в %s?"
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:200
+#: src/gui/windows/itemamountwindow.cpp:194
msgid "All"
msgstr "Всё"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:251
msgid "Select amount of items to trade."
msgstr "Сколько предметов продать."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:255
msgid "Select amount of items to drop."
msgstr "Сколько предметов сбросить."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:259
msgid "Select amount of items to store."
msgstr "Укажите количество вещей для хранения."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:270
+#: src/gui/windows/itemamountwindow.cpp:263
msgid "Select amount of items to send."
msgstr "Укажите количество для отправки."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:274
+#: src/gui/windows/itemamountwindow.cpp:267
msgid "Select amount of items to craft."
msgstr "Выберите количество для крафта."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:271
msgid "Select amount of items to store to cart."
msgstr "Укажите количество вещей для хранения в прицепе."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:275
msgid "Select amount of items to retrieve."
msgstr "Укажите количество вещей для изъятия."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:279
msgid "Select amount of items to retrieve from cart."
msgstr "Укажите количество вещей для изъятия из прицепа."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:283
msgid "Select amount of items to split."
msgstr "Сколько предметов разделить."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:287
msgid "Add to buy shop."
msgstr "Добавить в список покупки."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:291
msgid "Add to sell shop."
msgstr "Добавить в список продажи."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:295
msgid "Unknown."
msgstr "Неизвестно."
@@ -6678,39 +6792,39 @@ msgid "Reset timer"
msgstr "Сбросить таймер"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:166
-#: src/gui/windows/killstats.cpp:272 src/gui/windows/killstats.cpp:425
+#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:167
+#: src/gui/windows/killstats.cpp:274 src/gui/windows/killstats.cpp:430
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Убийств: %s, всего опыта: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:168
-#: src/gui/windows/killstats.cpp:249 src/gui/windows/killstats.cpp:264
-#: src/gui/windows/killstats.cpp:427
+#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:169
+#: src/gui/windows/killstats.cpp:251 src/gui/windows/killstats.cpp:266
+#: src/gui/windows/killstats.cpp:432
#, c-format
msgid "Avg Exp: %s"
msgstr "Средний опыт: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:171
-#: src/gui/windows/killstats.cpp:254 src/gui/windows/killstats.cpp:268
-#: src/gui/windows/killstats.cpp:430
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:172
+#: src/gui/windows/killstats.cpp:256 src/gui/windows/killstats.cpp:270
+#: src/gui/windows/killstats.cpp:435
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr "Средн. кол-во монстров до след. уров.: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:276 src/gui/windows/killstats.cpp:433
+#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:183
+#: src/gui/windows/killstats.cpp:278 src/gui/windows/killstats.cpp:438
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Убийств в минуту: %s, Опыта в минуту: %s"
#. TRANSLATORS: kill stats window label
#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:341
-#: src/gui/windows/killstats.cpp:360 src/gui/windows/killstats.cpp:381
+#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:344
+#: src/gui/windows/killstats.cpp:364 src/gui/windows/killstats.cpp:385
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6730,33 +6844,33 @@ msgstr[2] "Время до следующего уровня в мин. %d: %s"
msgstr[3] "Время до следующего уровня в мин. %d: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:281
+#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:283
msgid "Last kill exp:"
msgstr "Опыт за последнее убийство:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:234
+#: src/gui/windows/killstats.cpp:121 src/gui/windows/killstats.cpp:236
#, c-format
msgid "Level: %d at %f%%"
msgstr "Уровень: %d на %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:239
+#: src/gui/windows/killstats.cpp:126 src/gui/windows/killstats.cpp:241
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Опыт: %d/%d Осталось: %d"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:245
-#: src/gui/windows/killstats.cpp:259
+#: src/gui/windows/killstats.cpp:130 src/gui/windows/killstats.cpp:247
+#: src/gui/windows/killstats.cpp:261
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d опыта, среднее кол-во мобов для 1%%: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:347 src/gui/windows/killstats.cpp:356
-#: src/gui/windows/killstats.cpp:367 src/gui/windows/killstats.cpp:376
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:398
+#: src/gui/windows/killstats.cpp:350 src/gui/windows/killstats.cpp:360
+#: src/gui/windows/killstats.cpp:371 src/gui/windows/killstats.cpp:380
+#: src/gui/windows/killstats.cpp:393 src/gui/windows/killstats.cpp:402
#, c-format
msgid " Time for next level: %s"
msgstr " Время до следующего уровня: %s"
@@ -6833,15 +6947,13 @@ msgstr "Заголовок:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
msgid "Money:"
msgstr "Деньги:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
#: src/gui/windows/mailviewwindow.cpp:133
msgid "Item:"
msgstr "Премет:"
@@ -6949,41 +7061,41 @@ msgstr "работа"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:261
+#: src/gui/windows/ministatuswindow.cpp:357
+#: src/gui/windows/statuswindow.cpp:254
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Уровень: %d (GM %d)"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:379
-#: src/gui/windows/ministatuswindow.cpp:416
+#: src/gui/windows/ministatuswindow.cpp:381
+#: src/gui/windows/ministatuswindow.cpp:418
msgid "Need"
msgstr "Нужно"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:403
+#: src/gui/windows/ministatuswindow.cpp:405
#, c-format
msgid "Job level: %d"
msgstr "Уровень профессии: %d"
#. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:82
msgid "Stop waiting"
msgstr "Остановить ожидание"
#. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:84
msgid "Next"
msgstr "Следующий"
#. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:88
msgid "Submit"
msgstr "Применить"
#. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:132
msgid "Reset"
msgstr "Сбросить"
@@ -7077,17 +7189,13 @@ msgid "The username needs to be less than %u characters long."
msgstr "Имя пользователя должно содержать менее %u символов."
#. TRANSLATORS: error message
-#. TRANSLATORS: unregister dialog. error message.
#: src/gui/windows/registerdialog.cpp:206
-#: src/gui/windows/unregisterdialog.cpp:128
#, c-format
msgid "The password needs to be at least %u characters long."
msgstr "Пароль должен содержать не менее %u символов."
#. TRANSLATORS: error message
-#. TRANSLATORS: unregister dialog. error message.
#: src/gui/windows/registerdialog.cpp:215
-#: src/gui/windows/unregisterdialog.cpp:135
#, c-format
msgid "The password needs to be less than %u characters long."
msgstr "Пароль должен содержать не более %u символов."
@@ -7098,8 +7206,8 @@ msgid "Passwords do not match."
msgstr "Пароли не совпадают."
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:163
-#: src/net/eathena/loginrecv.cpp:107
+#: src/gui/windows/registerdialog.cpp:230 src/net/ea/loginrecv.cpp:164
+#: src/net/eathena/loginrecv.cpp:108
msgid "Incorrect email."
msgstr "Неправильный email."
@@ -7109,53 +7217,53 @@ msgid "Email too long."
msgstr "Email слишком длинный."
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:101
+#: src/gui/windows/serverdialog.cpp:95
msgid "Choose Your Server"
msgstr "Выберите сервер"
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:120
+#: src/gui/windows/serverdialog.cpp:114
msgid "Load"
msgstr "Загрузить"
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:126
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Выбор сервера *** БЕЗОПАСНЫЙ РЕЖИМ ***"
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:135
msgid "Use same ip for game sub servers"
msgstr "Использовать одинаковый IP для игровых суб-серверов"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:402
+#: src/gui/windows/serverdialog.cpp:396
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Получение списка серверов...%2.2f%%"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:408
+#: src/gui/windows/serverdialog.cpp:402
msgid "Waiting for server..."
msgstr "Ожидание ответа от сервера..."
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:413
+#: src/gui/windows/serverdialog.cpp:407
msgid "Preparing download"
msgstr "Подготовка к загрузке"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:418
+#: src/gui/windows/serverdialog.cpp:412
msgid "Error retreiving server list!"
msgstr "Не удалось получить список серверов!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:537
+#: src/gui/windows/serverdialog.cpp:531
msgid "requires a newer version"
msgstr "требуется более новая версия"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:542
+#: src/gui/windows/serverdialog.cpp:536
#, c-format
msgid "requires v%s"
msgstr "требуется v%s"
@@ -7171,120 +7279,126 @@ msgid "Reset Windows"
msgstr "Сбросить расположение окон"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1131
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:1114
msgid "Personal Shop"
msgstr "Свой магазин"
#. TRANSLATORS: shop window button
#. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:446
-#: src/gui/windows/shopwindow.cpp:471
+#: src/gui/windows/shopwindow.cpp:184 src/gui/windows/shopwindow.cpp:430
+#: src/gui/windows/shopwindow.cpp:455
msgid "Publish"
msgstr "Опубликовать"
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:201
+#: src/gui/windows/shopwindow.cpp:193
msgid "Announce"
msgstr "Анонс"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:203
+#: src/gui/windows/shopwindow.cpp:195
msgid "Show links in announce"
msgstr "Показывать ссылки"
#. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:375
+#: src/gui/windows/shopwindow.cpp:364
msgid "Please enter new shop name"
msgstr "Пожалуйста, введите имя вашего магазина"
#. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:441 src/gui/windows/shopwindow.cpp:466
+#: src/gui/windows/shopwindow.cpp:425 src/gui/windows/shopwindow.cpp:450
msgid "Unpublish"
msgstr "Убрать"
#. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:932
+#: src/gui/windows/shopwindow.cpp:916
msgid "error: player busy"
msgstr "ошибка: игрок занят"
#. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:979
+#: src/gui/windows/shopwindow.cpp:963
msgid "error: Can't sell this item"
msgstr "ошибка: нельзя продать предмет"
#. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:975
msgid "error: Can't buy this item"
msgstr "ошибка: нельзя купить предмет"
#. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1011
+#: src/gui/windows/shopwindow.cpp:995
#, c-format
msgid "%s wants to buy %s do you accept?"
msgstr "%s хочет купить %s. Вы разрешаете?"
#. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1018
+#: src/gui/windows/shopwindow.cpp:1002
#, c-format
msgid "%s wants to sell %s do you accept?"
msgstr "%s хочет продать %s. Вы разрешаете?"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1025 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1009 src/net/ea/traderecv.cpp:163
msgid "Request for Trade"
msgstr "Запрос на Торговлю"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1136
+#: src/gui/windows/shopwindow.cpp:1119
#, c-format
msgid "Personal Shop - %s"
msgstr "Персональный магазин - %s"
#. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:95
+#: src/gui/windows/skilldialog.cpp:93
msgid "Up"
msgstr "Верх"
#. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:210
+#: src/gui/windows/skilldialog.cpp:208
#, c-format
msgid "Skill points available: %d"
msgstr "Очков навыков осталось: %d"
#. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:313
+#: src/gui/windows/skilldialog.cpp:311
#, c-format
msgid "Skill Set %d"
msgstr "Навык %d"
#. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:334
+#: src/gui/windows/skilldialog.cpp:365
#, c-format
msgid "Skill %d"
msgstr "Навык %d"
+#. TRANSLATORS: skills dialog. skill id
+#: src/gui/windows/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Skill %u"
+msgstr "Навык %d"
+
#. TRANSLATORS: skills dialog. skill level
#. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:520 src/resources/skill/skillinfo.cpp:103
+#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
#, c-format
msgid "Lvl: %d"
msgstr "Уровень: %d"
#. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:527
+#: src/gui/windows/skilldialog.cpp:561
#, c-format
msgid "Failed skill: %s"
msgstr "Неудача навыка: %s"
#. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:816
+#: src/gui/windows/skilldialog.cpp:825
#, c-format
msgid "Add text to skill %s"
msgstr "Добавить текст к скилу %s"
#. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:819
+#: src/gui/windows/skilldialog.cpp:828
msgid "Text: "
msgstr "Текст: "
@@ -7409,99 +7523,93 @@ msgid "Choose your party's name."
msgstr "Выберите имя будущей группы."
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/statuswindow.cpp:76
msgid "HP:"
msgstr "Жизнь:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:77
+#: src/gui/windows/statuswindow.cpp:79
msgid "Exp:"
msgstr "Опыт:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:138
+#: src/gui/windows/statuswindow.cpp:136
msgid "MP:"
msgstr "Мана:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
+#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:312
#, c-format
msgid "Job: %d"
msgstr "Профессия: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:177
+#: src/gui/windows/statuswindow.cpp:175
msgid "Job:"
msgstr "Профессия:"
-#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
-#, c-format
-msgid "Character points: %d"
-msgstr "Очки персонажа: %d"
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:49
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "Command Editor"
msgstr "Редактор команд"
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:58
+#: src/gui/windows/textcommandeditor.cpp:61
msgid "magic"
msgstr "Магия"
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:60
+#: src/gui/windows/textcommandeditor.cpp:63
msgid "other"
msgstr "Другое"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:63
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Symbol:"
msgstr "Символ:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:66
+#: src/gui/windows/textcommandeditor.cpp:69
msgid "Command:"
msgstr "Команда:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:69
+#: src/gui/windows/textcommandeditor.cpp:72
msgid "Comment:"
msgstr "Комментарий:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:73
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Target Type:"
msgstr "Тип цели:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:77
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Icon:"
msgstr "Картинка:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:81
+#: src/gui/windows/textcommandeditor.cpp:84
msgid "Mana:"
msgstr "Мана:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:84
+#: src/gui/windows/textcommandeditor.cpp:87
msgid "Magic level:"
msgstr "Уровень Магии:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:88
+#: src/gui/windows/textcommandeditor.cpp:91
msgid "Magic School:"
msgstr "Школа Магии:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:91
+#: src/gui/windows/textcommandeditor.cpp:94
msgid "School level:"
msgstr "Уровень школы:"
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:97
+#: src/gui/windows/textcommandeditor.cpp:100
msgid "Save"
msgstr "Сохранить"
@@ -7553,28 +7661,16 @@ msgstr "У вас недостаточно денег."
#. TRANSLATORS: trade error
#: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид объектов более одного раза."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
+"объектов более одного раза."
#. TRANSLATORS: trade error
#: src/gui/windows/tradewindow.cpp:539
msgid "Failed adding item. You can not trade equipped items."
msgstr "Ошибка добавления предмета. Вы не можете обменивать одетые предметы."
-#. TRANSLATORS: unregister dialog name
-#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/unregisterdialog.cpp:48
-#: src/gui/windows/unregisterdialog.cpp:53
-msgid "Unregister"
-msgstr "Удалить регистрацию"
-
-#. TRANSLATORS: unregister dialog. label.
-#: src/gui/windows/unregisterdialog.cpp:64
-#, c-format
-msgid "Name: %s"
-msgstr "Имя: %s"
-
#. TRANSLATORS: updater window name
#: src/gui/windows/updaterwindow.cpp:171
msgid "Updating..."
@@ -7611,27 +7707,27 @@ msgid "Completed"
msgstr "Завершено"
#. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:92 src/gui/windows/whoisonline.cpp:654
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:655
msgid "Who Is Online - Updating"
msgstr "Кто онлайн - обновление"
#. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:104
+#: src/gui/windows/whoisonline.cpp:105
msgid "Update"
msgstr "Обновить"
#. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:233
+#: src/gui/windows/whoisonline.cpp:234
msgid "Who Is Online - "
msgstr "Кто онлайн - "
#. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:670
+#: src/gui/windows/whoisonline.cpp:671
msgid "Who Is Online - error"
msgstr "Кто онлайн - ошибка"
#. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:716
+#: src/gui/windows/whoisonline.cpp:717
msgid "Who Is Online - Update"
msgstr "Кто онлайн - обновление"
@@ -8822,7 +8918,8 @@ msgstr "Очистить окно бросания"
#. TRANSLATORS: error message
#: src/net/ea/charserverrecv.cpp:50
msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
+msgstr ""
+"В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
#. TRANSLATORS: error message
#: src/net/ea/charserverrecv.cpp:55
@@ -8837,11 +8934,12 @@ msgstr "Неизвестная ошибка сервера персонажей.
#. TRANSLATORS: error message
#: src/net/ea/charserverrecv.cpp:75
msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Невозможно создать персонажа. Скорее всего, такое имя уже используется."
+msgstr ""
+"Невозможно создать персонажа. Скорее всего, такое имя уже используется."
#. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:159
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
+#: src/net/eathena/loginrecv.cpp:103
msgid "Wrong name."
msgstr "Некорректное имя."
@@ -8984,35 +9082,39 @@ msgstr "Вас навсегда забанили. Пожалуйста, свяж
#. TRANSLATORS: error message
#: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old or wrong server type."
+#, fuzzy
+msgid ""
+"Client too old or wrong server type.\n"
+"Please update client on http://manaplus.org"
msgstr "Клиент устарел или неправильный тип сервера."
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:146 src/net/eathena/loginrecv.cpp:84
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
"Please contact the GM team via the forums."
-msgstr "Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
+msgstr ""
+"Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
msgid "Server overpopulated."
msgstr "Сервер переполнен."
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:155 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:156 src/net/eathena/loginrecv.cpp:98
msgid "This user name is already taken."
msgstr "Это имя пользователя уже занято."
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:167 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:168 src/net/eathena/loginrecv.cpp:113
msgid "Username permanently erased."
msgstr "Пользователь удален."
#. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:171 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:209 src/net/tmwa/loginrecv.cpp:120
+#: src/net/ea/loginrecv.cpp:172 src/net/eathena/loginrecv.cpp:117
+#: src/net/eathena/loginrecv.cpp:210 src/net/tmwa/loginrecv.cpp:120
msgid "Unknown error."
msgstr "Неизвестная ошибка."
@@ -9112,7 +9214,7 @@ msgid "Do you accept %s and %s as parents?"
msgstr "Вы принимаете %s и %s как своих родителей?"
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
+#: src/net/eathena/generalhandler.cpp:178 src/net/tmwa/generalhandler.cpp:182
msgid "Got disconnected from server!"
msgstr "Отключено от сервера!"
@@ -9276,17 +9378,17 @@ msgid "Unknown item"
msgstr "Неизвестный предмет"
#. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:197 src/net/tmwa/loginrecv.cpp:108
+#: src/net/eathena/loginrecv.cpp:198 src/net/tmwa/loginrecv.cpp:108
msgid "Account was not found. Please re-login."
msgstr "Учетная запись не найдена. Попробуйте снова."
#. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:201 src/net/tmwa/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:202 src/net/tmwa/loginrecv.cpp:112
msgid "Old password incorrect."
msgstr "Старый пароль указан неверно."
#. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:205 src/net/tmwa/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:206 src/net/tmwa/loginrecv.cpp:116
msgid "New password too short."
msgstr "Новый пароль слишком короткий."
@@ -9297,7 +9399,7 @@ msgid "You have new mail from %s with subject %s"
msgstr "Вам пришло сообщение от %s и заголовком %s"
#. TRANSLATORS: player killed message
-#: src/net/eathena/playerrecv.cpp:443
+#: src/net/eathena/playerrecv.cpp:460
msgid "You were killed by unknown source."
msgstr "Вы были убиты неизвестным."
@@ -9548,7 +9650,7 @@ msgstr "Новый OpenGL"
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
-#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:103
#: src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "безымянный"
@@ -9564,37 +9666,42 @@ msgid "skill"
msgstr "Скил"
#. TRANSLATORS: player stat
-#: src/resources/db/statdb.cpp:45
+#: src/resources/db/statdb.cpp:48
msgid "Strength"
msgstr "Сила (str)"
#. TRANSLATORS: player stat
-#: src/resources/db/statdb.cpp:49
+#: src/resources/db/statdb.cpp:52
msgid "Agility"
msgstr "Выносливость (agi)"
#. TRANSLATORS: player stat
-#: src/resources/db/statdb.cpp:53
+#: src/resources/db/statdb.cpp:56
msgid "Vitality"
msgstr "Живучесть (vit)"
#. TRANSLATORS: player stat
-#: src/resources/db/statdb.cpp:57
+#: src/resources/db/statdb.cpp:60
msgid "Intelligence"
msgstr "Интеллект (int)"
#. TRANSLATORS: player stat
-#: src/resources/db/statdb.cpp:61
+#: src/resources/db/statdb.cpp:64
msgid "Dexterity"
msgstr "Ловкость (dex)"
#. TRANSLATORS: player stat
-#: src/resources/db/statdb.cpp:65
+#: src/resources/db/statdb.cpp:68
msgid "Luck"
msgstr "Удача (luk)"
+#. TRANSLATORS: stats page name
+#: src/resources/db/statdb.cpp:203
+msgid "Extended"
+msgstr ""
+
#. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:340
+#: src/resources/inventory/inventory.cpp:338
msgid "Npc"
msgstr "НИП"
@@ -10082,7 +10189,8 @@ msgstr "Ошибка перемещения денег в банк. Возмож
msgid ""
"Withdraw failed. You probably don't have this amount of money in the bank "
"right now."
-msgstr "Ошибка перемещения денег из банка. Возможно у вас нет столько денег в банке."
+msgstr ""
+"Ошибка перемещения денег из банка. Возможно у вас нет столько денег в банке."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:432
@@ -10124,7 +10232,9 @@ msgstr "Сделка провалена."
msgid ""
"The trade failed, because the entered amount of item is higher, than the "
"buyer is willing to buy."
-msgstr "Сделка провалена потому, что указанное количество больще чем покупатель хочет купить."
+msgstr ""
+"Сделка провалена потому, что указанное количество больще чем покупатель "
+"хочет купить."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:465
@@ -10447,7 +10557,8 @@ msgstr "Ошибка игнорирования игрока."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:718
msgid "Player ignore failed. Because too many ignores."
-msgstr "Ошибка игнорирования игрока потому, что слишком много игнорируемых игроков."
+msgstr ""
+"Ошибка игнорирования игрока потому, что слишком много игнорируемых игроков."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:722
@@ -10540,7 +10651,8 @@ msgstr "Ошибка принятия ребенка. Ваш уровень сл
#: src/resources/notifications.h:816
msgid ""
"Child adoption failed. This player is already married and can't be a baby."
-msgstr "Ошибка принятия ребенка: этот игрок уже женат, и не может быть ребенком."
+msgstr ""
+"Ошибка принятия ребенка: этот игрок уже женат, и не может быть ребенком."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:821
@@ -10558,30 +10670,30 @@ msgid "Error saving location. You do not have warp skill."
msgstr "Ошибка сохранения позиции. У вас нет умения телепортации."
#. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:108
+#: src/resources/skill/skillinfo.cpp:106
#, c-format
msgid "Lvl: %d / %d"
msgstr "Ур.: %d / %d"
#. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:115
+#: src/resources/skill/skillinfo.cpp:113
#, c-format
msgid "Type: %s"
msgstr "Тип: %s"
#. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:139
+#: src/resources/skill/skillinfo.cpp:137
msgid "Unknown:"
msgstr "Неизвестно:"
#. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:146
+#: src/resources/skill/skillinfo.cpp:144
#, c-format
msgid " / Mana: -%d"
msgstr " / Мана: -%d"
#. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:154
+#: src/resources/skill/skillinfo.cpp:152
#, c-format
msgid "Range: %d"
msgstr "Дистанция: %d"
@@ -10615,7 +10727,9 @@ msgstr "Ловушка"
#: src/utils/booleanoptions.h:29
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
+msgstr ""
+"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
+"\"0\"."
#. TRANSLATORS: uptime command
#: src/utils/stringutils.cpp:946
@@ -10671,3 +10785,15 @@ msgstr "%d секунда"
#, c-format
msgid "%d seconds"
msgstr "%d секунд"
+
+#~ msgid "Unregister Successful"
+#~ msgstr "Регистрация удалена"
+
+#~ msgid "Farewell, come back any time..."
+#~ msgstr "Хорошо, возвращайтесь в любое время..."
+
+#~ msgid "Unregister"
+#~ msgstr "Удалить регистрацию"
+
+#~ msgid "Name: %s"
+#~ msgstr "Имя: %s"