summaryrefslogtreecommitdiff
path: root/po/ru.po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-25 12:43:07 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-25 12:43:07 +0300
commit4825dc84e992c8cbbdba44d10afb52f502f64d17 (patch)
tree0a471517d155cd808d548ac906317d6c22524e92 /po/ru.po
parent33a45a81e1e4633cde86dbd028a09b01b9f162e6 (diff)
downloadplus-4825dc84e992c8cbbdba44d10afb52f502f64d17.tar.gz
plus-4825dc84e992c8cbbdba44d10afb52f502f64d17.tar.bz2
plus-4825dc84e992c8cbbdba44d10afb52f502f64d17.tar.xz
plus-4825dc84e992c8cbbdba44d10afb52f502f64d17.zip
Update translations.
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po580
1 files changed, 309 insertions, 271 deletions
diff --git a/po/ru.po b/po/ru.po
index 8d1380a19..48c691f9f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Alexsl <alexlsh@mail.ru>, 2013-2014
+# Alexsl <alexlsh@mail.ru>, 2013-2015
# Andrei Karas <akaras@inbox.ru>, 2011-2015
# Ильшат Сайдуллин <bio_editor@mail.ru>, 2013
# John Smith <torck777@safe-mail.net>, 2014
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-01-17 13:04+0300\n"
-"PO-Revision-Date: 2015-01-07 11:00+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2015-01-25 11:25+0300\n"
+"PO-Revision-Date: 2015-01-18 17:26+0000\n"
+"Last-Translator: Alexsl <alexlsh@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
"language/ru/)\n"
"Language: ru\n"
@@ -59,7 +59,7 @@ msgstr "Файл выгружен"
#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:59
#: src/gui/windows/editserverdialog.cpp:217
-#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:166 src/gui/windows/quitdialog.cpp:68
#: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:505
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
@@ -72,95 +72,95 @@ msgstr "ОК"
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:892 src/actions/actions.cpp:904
+#: src/actions/actions.cpp:904 src/actions/actions.cpp:916
msgid "Cache cleaned"
msgstr "Кеш очищен"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1032 src/actions/actions.cpp:1088
+#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1100
#, c-format
msgid "Client uptime: %s"
msgstr "Время работы клиента: %s"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1043
+#: src/actions/actions.cpp:1055
#, c-format
msgid "%d week"
msgstr "%d неделя"
-#: src/actions/actions.cpp:1043
+#: src/actions/actions.cpp:1055
#, c-format
msgid "%d weeks"
msgstr "%d недель"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1066
#, c-format
msgid "%d day"
msgstr "%d день"
-#: src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1066
#, c-format
msgid "%d days"
msgstr "%d дней"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1064
+#: src/actions/actions.cpp:1076
#, c-format
msgid "%d hour"
msgstr "%d час"
-#: src/actions/actions.cpp:1064
+#: src/actions/actions.cpp:1076
#, c-format
msgid "%d hours"
msgstr "%d часов"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1074
+#: src/actions/actions.cpp:1086
#, c-format
msgid "%d minute"
msgstr "%d минута"
-#: src/actions/actions.cpp:1074
+#: src/actions/actions.cpp:1086
#, c-format
msgid "%d minutes"
msgstr "%d минут"
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1084
+#: src/actions/actions.cpp:1096
#, c-format
msgid "%d second"
msgstr "%d секунда"
-#: src/actions/actions.cpp:1084
+#: src/actions/actions.cpp:1096
#, c-format
msgid "%d seconds"
msgstr "%d секунд"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1145 src/actions/actions.cpp:1154
+#: src/actions/actions.cpp:1157 src/actions/actions.cpp:1166
msgid "Resource images:"
msgstr "Изображений:"
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1148 src/actions/actions.cpp:1157
+#: src/actions/actions.cpp:1160 src/actions/actions.cpp:1169
msgid "Resource orphaned images:"
msgstr "Удаленных изображений:"
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1245
+#: src/actions/actions.cpp:1257
msgid "Environment variables dumped"
msgstr "Переменные среды сохранены"
-#: src/actions/actions.cpp:1364
+#: src/actions/actions.cpp:1376
msgid "Uploaded config into:"
msgstr "Информация о выгруженном конфиге:"
-#: src/actions/actions.cpp:1373
+#: src/actions/actions.cpp:1385
msgid "Uploaded server config into:"
msgstr "Информация о выгруженном конфиге сервера:"
-#: src/actions/actions.cpp:1382
+#: src/actions/actions.cpp:1394
msgid "Uploaded log into:"
msgstr "Информация о выгруженном логе:"
@@ -302,25 +302,25 @@ msgid "Visible on map"
msgstr "Видимые на карте"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:398
+#: src/being/being.cpp:399
msgid "Human"
msgstr "Человек"
-#: src/being/being.cpp:567
+#: src/being/being.cpp:568
msgid "dodge"
msgstr "уклонение"
-#: src/being/being.cpp:567
+#: src/being/being.cpp:568
msgid "miss"
msgstr "промах"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1898 src/gui/windows/whoisonline.cpp:857
+#: src/being/being.cpp:1900 src/gui/windows/whoisonline.cpp:857
msgid "A"
msgstr "О"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1903 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1905 src/gui/windows/whoisonline.cpp:862
msgid "I"
msgstr "Б"
@@ -331,53 +331,53 @@ msgid "You were killed by %s."
msgstr "Вы были убиты %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:831
+#: src/being/localplayer.cpp:834
msgid "Tried to pick up nonexistent item."
msgstr "Попытка поднять несуществующий предмет."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:835
+#: src/being/localplayer.cpp:838
msgid "Item is too heavy."
msgstr "Предмет слишком тяжелый."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:839
+#: src/being/localplayer.cpp:842
msgid "Item is too far away."
msgstr "Предмет слишком далеко."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:843
+#: src/being/localplayer.cpp:846
msgid "Inventory is full."
msgstr "Инвентарь переполнен."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:847
+#: src/being/localplayer.cpp:850
msgid "Stack is too big."
msgstr "Слишком много предметов."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:851
+#: src/being/localplayer.cpp:854
msgid "Item belongs to someone else."
msgstr "Предмет принадлежит кому-то еще."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:855
+#: src/being/localplayer.cpp:858
msgid "You can't pickup this amount of items."
msgstr "Вы не можете поднять такое количество."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:859
+#: src/being/localplayer.cpp:862
msgid "Your item stack has max amount."
msgstr "Слишком много предметов в стэке."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:866
+#: src/being/localplayer.cpp:869
msgid "Unknown problem picking up item."
msgstr "Неизвестная проблема при поднятии предмета."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:890
+#: src/being/localplayer.cpp:893
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -387,43 +387,43 @@ msgstr[2] "Вы подняли %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1072 src/being/localplayer.cpp:1073
-#: src/being/localplayer.cpp:1109
+#: src/being/localplayer.cpp:1075 src/being/localplayer.cpp:1076
+#: src/being/localplayer.cpp:1112
msgid "xp"
msgstr "опыт"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1077 src/being/localplayer.cpp:1083
-#: src/being/localplayer.cpp:1089
+#: src/being/localplayer.cpp:1080 src/being/localplayer.cpp:1086
+#: src/being/localplayer.cpp:1092
msgid "job"
msgstr "работа"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2819
+#: src/being/localplayer.cpp:2822
#, c-format
msgid "Follow: %s"
msgstr "Следовать за: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2825 src/being/localplayer.cpp:2850
+#: src/being/localplayer.cpp:2828 src/being/localplayer.cpp:2853
msgid "Follow canceled"
msgstr "Следование отменено"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2835
+#: src/being/localplayer.cpp:2838
#, c-format
msgid "Imitation: %s"
msgstr "Имитация: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2841 src/being/localplayer.cpp:2855
+#: src/being/localplayer.cpp:2844 src/being/localplayer.cpp:2858
msgid "Imitation canceled"
msgstr "Имитация отменена"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3205
+#: src/being/localplayer.cpp:3208
#, c-format
msgid "You see %s"
msgstr "Вы видите %s"
@@ -433,8 +433,8 @@ msgstr "Вы видите %s"
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2290
-#: src/gui/popups/popupmenu.cpp:2332
+#: src/being/playerrelations.cpp:468 src/gui/popups/popupmenu.cpp:2299
+#: src/gui/popups/popupmenu.cpp:2341
msgid "Completely ignore"
msgstr "Полностью игнорировать"
@@ -461,7 +461,7 @@ msgstr "Плавающий пузырек"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:928 src/gui/windowmenu.cpp:166
+#: src/client.cpp:928 src/gui/windowmenu.cpp:169
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Настройка"
@@ -510,7 +510,8 @@ msgstr "Помощь"
#: src/client.cpp:947 src/client.cpp:1401 src/client.cpp:1415
#: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:714
#: src/gui/popups/popupmenu.cpp:948 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:76
+#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:265 src/gui/windows/npcdialog.cpp:76
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/questswindow.cpp:77
#: src/gui/windows/shopwindow.cpp:84
msgid "Close"
@@ -645,36 +646,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd файл_строка_цвета файл_назначения"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236
+#: src/game.cpp:240
msgid "General"
msgstr "Общие"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:254 src/gui/windowmenu.cpp:153
+#: src/game.cpp:258 src/gui/windowmenu.cpp:156
#: src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr "Отладка"
#. TRANSLATORS: save file message
-#: src/game.cpp:534
+#: src/game.cpp:539
#, c-format
msgid "Screenshot saved as %s"
msgstr "Снимок экрана сохранен как %s"
#. TRANSLATORS: save file message
-#: src/game.cpp:544
+#: src/game.cpp:549
msgid "Saving screenshot failed!"
msgstr "Ошибка при сохранении снимка экрана!"
#. TRANSLATORS: error message text
-#: src/game.cpp:627
+#: src/game.cpp:632
msgid "The connection to the server was lost."
msgstr "Соединение с сервером потеряно."
#. TRANSLATORS: error message header
-#: src/game.cpp:630
+#: src/game.cpp:635
msgid "Network Error"
msgstr "Ошибка сети"
@@ -1067,7 +1068,7 @@ msgstr "Сообщение"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2611
+#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2620
msgid "Revive"
msgstr "Оживить"
@@ -1093,7 +1094,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:609
+#: src/gui/windows/equipmentwindow.cpp:614
msgid "default"
msgstr "По умолчанию"
@@ -1254,8 +1255,8 @@ msgstr "Огромный (23)"
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1993
-#: src/gui/popups/popupmenu.cpp:2071 src/gui/widgets/tabs/socialtabbase.h:48
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2002
+#: src/gui/popups/popupmenu.cpp:2080 src/gui/widgets/tabs/socialtabbase.h:48
msgid "(default)"
msgstr "(по умолчанию)"
@@ -1535,20 +1536,20 @@ msgstr "Создать группу"
#: src/gui/popups/popupmenu.cpp:642 src/gui/popups/popupmenu.cpp:667
#: src/gui/popups/popupmenu.cpp:692 src/gui/popups/popupmenu.cpp:877
#: src/gui/popups/popupmenu.cpp:904 src/gui/popups/popupmenu.cpp:937
-#: src/gui/popups/popupmenu.cpp:1735 src/gui/popups/popupmenu.cpp:1771
-#: src/gui/popups/popupmenu.cpp:1821 src/gui/popups/popupmenu.cpp:1863
-#: src/gui/popups/popupmenu.cpp:1904 src/gui/popups/popupmenu.cpp:1972
-#: src/gui/popups/popupmenu.cpp:2050 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2131
-#: src/gui/popups/popupmenu.cpp:2152 src/gui/popups/popupmenu.cpp:2177
-#: src/gui/popups/popupmenu.cpp:2194 src/gui/popups/popupmenu.cpp:2504
-#: src/gui/popups/popupmenu.cpp:2623 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1744 src/gui/popups/popupmenu.cpp:1780
+#: src/gui/popups/popupmenu.cpp:1830 src/gui/popups/popupmenu.cpp:1872
+#: src/gui/popups/popupmenu.cpp:1913 src/gui/popups/popupmenu.cpp:1981
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2093
+#: src/gui/popups/popupmenu.cpp:2119 src/gui/popups/popupmenu.cpp:2140
+#: src/gui/popups/popupmenu.cpp:2161 src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2203 src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2632 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:58
#: src/gui/windows/changepassworddialog.cpp:60
#: src/gui/windows/charcreatedialog.cpp:124
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:160
+#: src/gui/windows/itemamountwindow.cpp:168
#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
#: src/gui/windows/textcommandeditor.cpp:87 src/gui/windows/textdialog.cpp:55
@@ -1665,7 +1666,7 @@ msgstr "Разговор"
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2363
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:2372
#: src/gui/windows/buydialog.cpp:185 src/gui/windows/buydialog.cpp:201
#: src/gui/windows/buydialog.cpp:262 src/gui/windows/buyselldialog.cpp:71
#: src/input/pages/basic.cpp:240 src/resources/db/npcdb.cpp:147
@@ -1680,7 +1681,7 @@ msgstr "Купить"
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: shop window button
#. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2366
+#: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2375
#: src/gui/widgets/selldialog.cpp:51 src/gui/widgets/selldialog.cpp:96
#: src/gui/windows/buyselldialog.cpp:73 src/input/pages/basic.cpp:246
#: src/resources/db/npcdb.cpp:148
@@ -1692,7 +1693,7 @@ msgstr "Продать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:464
-#: src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2475
msgid "Add comment"
msgstr "Добавить комментарий"
@@ -1718,7 +1719,7 @@ msgstr "Добавить в список атаки"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2486
+#: src/gui/popups/popupmenu.cpp:303 src/gui/popups/popupmenu.cpp:2495
msgid "Add to ignore list"
msgstr "Добавить в список игнорирования"
@@ -1759,7 +1760,7 @@ msgstr "Бросить лут"
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:343 src/gui/windows/equipmentwindow.cpp:75
-#: src/gui/windows/inventorywindow.cpp:176 src/resources/itemtypemapdata.h:47
+#: src/gui/windows/inventorywindow.cpp:186 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
@@ -1791,8 +1792,8 @@ msgstr "Игроки"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/popupmenu.cpp:2435
+#: src/gui/popups/popupmenu.cpp:476 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2444
msgid "Kick from party"
msgstr "Выкинуть из группы"
@@ -1804,8 +1805,8 @@ msgstr "Поднять"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1731
-#: src/gui/popups/popupmenu.cpp:1807 src/gui/popups/popupmenu.cpp:1849
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:1740
+#: src/gui/popups/popupmenu.cpp:1816 src/gui/popups/popupmenu.cpp:1858
msgid "Add to chat"
msgstr "Добавить в чат"
@@ -1826,8 +1827,8 @@ msgstr "Переименовать"
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2046
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:599 src/gui/popups/popupmenu.cpp:2055
+#: src/gui/popups/popupmenu.cpp:2089
msgid "Remove"
msgstr "Удалить"
@@ -1846,11 +1847,9 @@ msgstr "Передвинуть камеру"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:656 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:141 src/gui/windows/inventorywindow.cpp:193
-#: src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windowmenu.cpp:144 src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr "Наряды"
@@ -1862,7 +1861,7 @@ msgstr "Очистить наряд"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:685 src/gui/windowmenu.cpp:125
+#: src/gui/popups/popupmenu.cpp:685 src/gui/windowmenu.cpp:128
msgid "Spells"
msgstr "Заклинания"
@@ -1928,8 +1927,8 @@ msgstr "Покинуть"
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2148
-#: src/gui/popups/popupmenu.cpp:2190
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2199
msgid "Copy to clipboard"
msgstr "Копировать в буфер обмена"
@@ -1976,23 +1975,23 @@ msgstr "Комментарий: "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1636
+#: src/gui/popups/popupmenu.cpp:1639
msgid "Add to trade"
msgstr "Добавить к сделке"
-#: src/gui/popups/popupmenu.cpp:1644
+#: src/gui/popups/popupmenu.cpp:1647
msgid "Add to trade 10"
msgstr "Добавить к сделке 10"
-#: src/gui/popups/popupmenu.cpp:1649
+#: src/gui/popups/popupmenu.cpp:1652
msgid "Add to trade half"
msgstr "Добавить к сделке половину"
-#: src/gui/popups/popupmenu.cpp:1653
+#: src/gui/popups/popupmenu.cpp:1656
msgid "Add to trade all-1"
msgstr "Добавить к торговле все-1"
-#: src/gui/popups/popupmenu.cpp:1657
+#: src/gui/popups/popupmenu.cpp:1660
msgid "Add to trade all"
msgstr "Добавить к торговле все"
@@ -2001,48 +2000,50 @@ msgstr "Добавить к торговле все"
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1665 src/gui/popups/popupmenu.cpp:1803
-#: src/gui/popups/popupmenu.cpp:1844 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:1668 src/gui/popups/popupmenu.cpp:1812
+#: src/gui/popups/popupmenu.cpp:1853 src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:261
+#: src/gui/windows/inventorywindow.cpp:813 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Сохранить"
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1676
msgid "Store 10"
msgstr "Сохранить 10"
-#: src/gui/popups/popupmenu.cpp:1678
+#: src/gui/popups/popupmenu.cpp:1681
msgid "Store half"
msgstr "Сохранить половину"
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1685
msgid "Store all-1"
msgstr "Сохранить все-1"
-#: src/gui/popups/popupmenu.cpp:1686
+#: src/gui/popups/popupmenu.cpp:1689
msgid "Store all"
msgstr "Сохранить все"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1699 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windows/inventorywindow.cpp:263
msgid "Retrieve"
msgstr "Получить"
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
msgid "Retrieve 10"
msgstr "Получить 10"
-#: src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1712
msgid "Retrieve half"
msgstr "Получить половину"
-#: src/gui/popups/popupmenu.cpp:1715
+#: src/gui/popups/popupmenu.cpp:1716
msgid "Retrieve all-1"
msgstr "Забрать все-1"
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1720
msgid "Retrieve all"
msgstr "Получить все"
@@ -2052,9 +2053,9 @@ msgstr "Получить все"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1765 src/gui/popups/popupmenu.cpp:2554
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:632 src/gui/windows/skilldialog.cpp:82
+#: src/gui/popups/popupmenu.cpp:1774 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/windows/inventorywindow.cpp:184
+#: src/gui/windows/inventorywindow.cpp:711 src/gui/windows/skilldialog.cpp:82
#: src/gui/windows/skilldialog.cpp:154 src/gui/windows/skilldialog.cpp:324
#: src/gui/windows/skilldialog.cpp:457 src/gui/windows/skilldialog.cpp:539
#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
@@ -2062,41 +2063,41 @@ msgid "Use"
msgstr "Использовать"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1859
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Clear drop window"
msgstr "Очистить окно дропов"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1890 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:1899 src/gui/popups/popupmenu.cpp:1960
msgid "Hide"
msgstr "Спрятать"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897 src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1906 src/gui/popups/popupmenu.cpp:1967
msgid "Show"
msgstr "Показать"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:1974
msgid "Reset yellow bar"
msgstr "сбросить настройки"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1969 src/gui/windows/statuswindow.cpp:94
+#: src/gui/popups/popupmenu.cpp:1978 src/gui/windows/statuswindow.cpp:94
msgid "Copy to chat"
msgstr "Скопировать в чат"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:2018 src/gui/popups/popupmenu.cpp:2037
msgid "Move up"
msgstr "Передвинуть выше"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2015 src/gui/popups/popupmenu.cpp:2034
+#: src/gui/popups/popupmenu.cpp:2024 src/gui/popups/popupmenu.cpp:2043
msgid "Move down"
msgstr "Передвинуть ниже"
@@ -2104,155 +2105,155 @@ msgstr "Передвинуть ниже"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2115 src/gui/popups/popupmenu.cpp:2472
msgid "Undress"
msgstr "Раздеть"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2124
+#: src/gui/popups/popupmenu.cpp:2133
msgid "Copy"
msgstr "Копировать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2136
msgid "Paste"
msgstr "Вставить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2145
+#: src/gui/popups/popupmenu.cpp:2154
msgid "Open link"
msgstr "Открыть ссылку"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2163
+#: src/gui/popups/popupmenu.cpp:2172
msgid "Show window"
msgstr "Показать окно"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2272
-#: src/gui/popups/popupmenu.cpp:2311 src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2281
+#: src/gui/popups/popupmenu.cpp:2320 src/gui/popups/popupmenu.cpp:2338
msgid "Disregard"
msgstr "Пренебречь"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2239 src/gui/popups/popupmenu.cpp:2275
-#: src/gui/popups/popupmenu.cpp:2314 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2323 src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr "Игнорировать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2242 src/gui/popups/popupmenu.cpp:2317
+#: src/gui/popups/popupmenu.cpp:2251 src/gui/popups/popupmenu.cpp:2326
msgid "Black list"
msgstr "Черный список"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2245 src/gui/popups/popupmenu.cpp:2278
+#: src/gui/popups/popupmenu.cpp:2254 src/gui/popups/popupmenu.cpp:2287
msgid "Set as enemy"
msgstr "Сделать врагом"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2248 src/gui/popups/popupmenu.cpp:2281
-#: src/gui/popups/popupmenu.cpp:2293 src/gui/popups/popupmenu.cpp:2302
-#: src/gui/popups/popupmenu.cpp:2320
+#: src/gui/popups/popupmenu.cpp:2257 src/gui/popups/popupmenu.cpp:2290
+#: src/gui/popups/popupmenu.cpp:2302 src/gui/popups/popupmenu.cpp:2311
+#: src/gui/popups/popupmenu.cpp:2329
msgid "Erase"
msgstr "Стереть"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2258
+#: src/gui/popups/popupmenu.cpp:2267
msgid "Be friend"
msgstr "Подружиться"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2269 src/gui/popups/popupmenu.cpp:2287
-#: src/gui/popups/popupmenu.cpp:2299 src/gui/popups/popupmenu.cpp:2308
-#: src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2278 src/gui/popups/popupmenu.cpp:2296
+#: src/gui/popups/popupmenu.cpp:2308 src/gui/popups/popupmenu.cpp:2317
+#: src/gui/popups/popupmenu.cpp:2335
msgid "Unignore"
msgstr "Не игнорировать"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2354
msgid "Follow"
msgstr "Следовать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2358
msgid "Imitate"
msgstr "Имитировать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2397
msgid "Buy (?)"
msgstr "Купить (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2400
msgid "Sell (?)"
msgstr "Продать (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2405 src/gui/popups/popupmenu.cpp:2429
+#: src/gui/popups/popupmenu.cpp:2414 src/gui/popups/popupmenu.cpp:2438
msgid "Invite to party"
msgstr "Пригласить в группу"
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2461
#, c-format
msgid "Join chat %s"
msgstr "Присоединиться к чату %s"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2460
+#: src/gui/popups/popupmenu.cpp:2469
msgid "Show Items"
msgstr "Показать предметы"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2477
+#: src/gui/popups/popupmenu.cpp:2486
msgid "Remove from pickup list"
msgstr "Удалить из поднятия"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2482
+#: src/gui/popups/popupmenu.cpp:2491
msgid "Add to pickup list"
msgstr "Сделать поднимаемым"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2531
+#: src/gui/popups/popupmenu.cpp:2540
msgid "Unprotect item"
msgstr "Снять защиту"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2549
msgid "Protect item"
msgstr "Поставить защиту"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2569 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:727
+#: src/gui/popups/popupmenu.cpp:2578 src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:821
msgid "Drop..."
msgstr "Бросить..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2581
msgid "Drop all"
msgstr "Бросить все"
@@ -2260,43 +2261,43 @@ msgstr "Бросить все"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2578 src/gui/windowmenu.cpp:129
-#: src/gui/windows/inventorywindow.cpp:732
+#: src/gui/popups/popupmenu.cpp:2587 src/gui/windowmenu.cpp:132
+#: src/gui/windows/inventorywindow.cpp:826
msgid "Drop"
msgstr "Бросить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:2598
msgid "GM..."
msgstr "ГМ..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2597
+#: src/gui/popups/popupmenu.cpp:2606
msgid "GM commands"
msgstr "Коменды ГМ"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2602
+#: src/gui/popups/popupmenu.cpp:2611
msgid "Check ip"
msgstr "Проверить IP"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2605
+#: src/gui/popups/popupmenu.cpp:2614
msgid "Goto"
msgstr "Перейти"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2617
msgid "Recall"
msgstr "Вызвать"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2616
+#: src/gui/popups/popupmenu.cpp:2625
msgid "Kick"
msgstr "Кикнуть"
@@ -2307,15 +2308,16 @@ msgstr "Основное"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:121
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:124
msgid "Shortcuts"
msgstr "Горячие клавиши"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
+#. TRANSLATORS: input action label
#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:162
+#: src/gui/windowmenu.cpp:165 src/input/pages/windows.cpp:36
msgid "Windows"
msgstr "Окна"
@@ -2583,7 +2585,7 @@ msgstr "Уровень: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:557 src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/inventorywindow.cpp:636 src/gui/windows/statuswindow.cpp:75
#: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:347
#, c-format
msgid "Money: %s"
@@ -2619,8 +2621,8 @@ msgstr "Выход"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (plus sign)
#: src/gui/widgets/selldialog.cpp:116 src/gui/windows/buydialog.cpp:256
-#: src/gui/windows/itemamountwindow.cpp:156
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:107
+#: src/gui/windows/itemamountwindow.cpp:164
+#: src/gui/windows/itemamountwindow.cpp:199 src/gui/windows/npcdialog.cpp:107
#: src/gui/windows/statuswindow.cpp:751
msgid "+"
msgstr "+"
@@ -2632,8 +2634,8 @@ msgstr "+"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: status window label (minus sign)
#: src/gui/widgets/selldialog.cpp:118 src/gui/windows/buydialog.cpp:259
-#: src/gui/windows/itemamountwindow.cpp:154
-#: src/gui/windows/itemamountwindow.cpp:188 src/gui/windows/npcdialog.cpp:109
+#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/itemamountwindow.cpp:196 src/gui/windows/npcdialog.cpp:109
#: src/gui/windows/statuswindow.cpp:764
msgid "-"
msgstr "-"
@@ -2679,7 +2681,7 @@ msgstr "Тип: %s"
#. TRANSLATORS: Skill type
#. TRANSLATORS: unknown equipment page name
-#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:616
+#: src/gui/widgets/skillinfo.cpp:109 src/gui/windows/equipmentwindow.cpp:621
msgid "Unknown"
msgstr "Неизвестный"
@@ -3324,7 +3326,9 @@ msgstr "Показывать MVP сообщения"
#. TRANSLATORS: settings group
#. TRANSLATORS: input action group
+#. TRANSLATORS: input action label
#: src/gui/widgets/tabs/setup_chat.cpp:128 src/input/pages/chat.cpp:63
+#: src/input/pages/windows.cpp:204
msgid "Tabs"
msgstr "Страницы"
@@ -3672,7 +3676,7 @@ msgstr "Прокручивать прицел по монстрам"
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:108
#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
#: src/gui/windows/minimap.cpp:121
msgid "Map"
@@ -3844,10 +3848,8 @@ msgstr "Включить напоминание о весе"
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
-#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:137
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:140
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:195
msgid "Shop"
msgstr "Магазин"
@@ -4914,9 +4916,7 @@ msgid "EQU"
msgstr "СН"
#. TRANSLATORS: equipment window name
-#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:68
-#: src/gui/windows/inventorywindow.cpp:197
msgid "Equipment"
msgstr "Снаряжение"
@@ -4927,111 +4927,122 @@ msgstr "ИНВ"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:132
+#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:140
#: src/inventory.cpp:299
msgid "Inventory"
msgstr "Инвентарь"
-#. TRANSLATORS: short button name for map window.
+#. TRANSLATORS: short button name for cart window.
#: src/gui/windowmenu.cpp:104
+#, fuzzy
+msgid "CA"
+msgstr "О"
+
+#. TRANSLATORS: inventory type name
+#: src/gui/windowmenu.cpp:105 src/inventory.cpp:309
+msgid "Cart"
+msgstr "Телега"
+
+#. TRANSLATORS: short button name for map window.
+#: src/gui/windowmenu.cpp:107
msgid "MAP"
msgstr "КАР"
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:113
msgid "SKI"
msgstr "УМ"
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:74
+#: src/gui/windowmenu.cpp:114 src/gui/windows/skilldialog.cpp:74
msgid "Skills"
msgstr "Навыки"
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:115
+#: src/gui/windowmenu.cpp:118
msgid "SOC"
msgstr "ОБЩ"
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:117 src/gui/windows/socialwindow.cpp:62
+#: src/gui/windowmenu.cpp:120 src/gui/windows/socialwindow.cpp:62
msgid "Social"
msgstr "Общество"
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:119
+#: src/gui/windowmenu.cpp:122
msgid "SH"
msgstr "ГК"
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:123
+#: src/gui/windowmenu.cpp:126
msgid "SP"
msgstr "ЗАК"
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:127
+#: src/gui/windowmenu.cpp:130
msgid "DR"
msgstr "БР"
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:131
+#: src/gui/windowmenu.cpp:134
msgid "YK"
msgstr "ВЗ"
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:133
+#: src/gui/windowmenu.cpp:136
msgid "Did you know"
msgstr "Знаете ли вы"
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:135
+#: src/gui/windowmenu.cpp:138
msgid "SHP"
msgstr "МАГ"
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:139
+#: src/gui/windowmenu.cpp:142
msgid "OU"
msgstr "НАР"
#. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:143
+#: src/gui/windowmenu.cpp:146
msgid "UP"
msgstr "ОБ"
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:145
+#: src/gui/windowmenu.cpp:148
msgid "Updates"
msgstr "Обновления"
#. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:147
+#: src/gui/windowmenu.cpp:150
msgid "BA"
msgstr "БА"
#. TRANSLATORS: full button name
#. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:149 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:152 src/gui/windows/bankwindow.cpp:43
msgid "Bank"
msgstr "Банк"
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:151
+#: src/gui/windowmenu.cpp:154
msgid "DBG"
msgstr "ОТЛ"
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:160
+#: src/gui/windowmenu.cpp:163
msgid "WIN"
msgstr "ОКН"
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:164
+#: src/gui/windowmenu.cpp:167
msgid "SET"
msgstr "ОПЦ"
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windowmenu.cpp:302 src/gui/windows/outfitwindow.cpp:77
#: src/gui/windows/outfitwindow.cpp:571
#, c-format
msgid "Key: %s"
@@ -5512,7 +5523,7 @@ msgstr "Знаете ли вы..."
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:172 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:182 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
@@ -5524,52 +5535,88 @@ msgid "Equip"
msgstr "Надеть"
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:191
+#: src/gui/windows/inventorywindow.cpp:201
msgid "Split"
msgstr "Разделить"
+#. TRANSLATORS: inventory outfits button
+#: src/gui/windows/inventorywindow.cpp:203
+#, fuzzy
+msgid "O"
+msgstr "ОК"
+
+#. TRANSLATORS: inventory cart button
+#: src/gui/windows/inventorywindow.cpp:205
+#, fuzzy
+msgid "C"
+msgstr "ДБ"
+
+#. TRANSLATORS: inventory shop button
+#: src/gui/windows/inventorywindow.cpp:207
+#, fuzzy
+msgid "S"
+msgstr "СА"
+
+#. TRANSLATORS: inventory equipment button
+#: src/gui/windows/inventorywindow.cpp:209
+#, fuzzy
+msgid "E"
+msgstr "КВ"
+
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:162
+#: src/gui/windows/itemamountwindow.cpp:170
msgid "All"
msgstr "Всё"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:218
+#: src/gui/windows/itemamountwindow.cpp:226
msgid "Select amount of items to trade."
msgstr "Сколько предметов продать."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:222
+#: src/gui/windows/itemamountwindow.cpp:230
msgid "Select amount of items to drop."
msgstr "Сколько предметов сбросить."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:226
+#: src/gui/windows/itemamountwindow.cpp:234
msgid "Select amount of items to store."
msgstr "Укажите количество вещей для хранения."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:230
+#: src/gui/windows/itemamountwindow.cpp:238
+#, fuzzy
+msgid "Select amount of items to store to cart."
+msgstr "Укажите количество вещей для хранения."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:242
msgid "Select amount of items to retrieve."
msgstr "Укажите количество вещей для изъятия."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:234
+#: src/gui/windows/itemamountwindow.cpp:246
+#, fuzzy
+msgid "Select amount of items to retrieve from cart."
+msgstr "Укажите количество вещей для изъятия."
+
+#. TRANSLATORS: amount window message
+#: src/gui/windows/itemamountwindow.cpp:250
msgid "Select amount of items to split."
msgstr "Сколько предметов разделить."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:238
+#: src/gui/windows/itemamountwindow.cpp:254
msgid "Add to buy shop."
msgstr "Добавить в список покупки."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:242
+#: src/gui/windows/itemamountwindow.cpp:258
msgid "Add to sell shop."
msgstr "Добавить в список продажи."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:246
+#: src/gui/windows/itemamountwindow.cpp:262
msgid "Unknown."
msgstr "Неизвестно."
@@ -5825,7 +5872,7 @@ msgstr "Применить"
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:116 src/gui/windows/serverdialog.cpp:128
#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
-#: src/gui/windows/tradewindow.cpp:84
+#: src/gui/windows/tradewindow.cpp:85
msgid "Add"
msgstr "Добавить"
@@ -6284,53 +6331,53 @@ msgid "Save"
msgstr "Сохранить"
#. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:64
+#: src/gui/windows/tradewindow.cpp:65
msgid "Propose trade"
msgstr "Предложить торговлю"
#. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:66
+#: src/gui/windows/tradewindow.cpp:67
msgid "Confirmed. Waiting..."
msgstr "Подтверждено. Ждем-с..."
#. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:68
+#: src/gui/windows/tradewindow.cpp:69
msgid "Agree trade"
msgstr "Подтвердить торговлю"
#. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:70
+#: src/gui/windows/tradewindow.cpp:71
msgid "Agreed. Waiting..."
msgstr "Подтверждено. Ждем-с..."
#. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:74
+#: src/gui/windows/tradewindow.cpp:75
msgid "Trade: You"
msgstr "Торговля: Вы"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:82 src/gui/windows/tradewindow.cpp:189
+#: src/gui/windows/tradewindow.cpp:83 src/gui/windows/tradewindow.cpp:192
#, c-format
msgid "You get %s"
msgstr "Вы получаете %s."
#. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:87
+#: src/gui/windows/tradewindow.cpp:88
msgid "Change"
msgstr "Сменить"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:132
+#: src/gui/windows/tradewindow.cpp:133
msgid "You give:"
msgstr "Вы отдаете:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:410
+#: src/gui/windows/tradewindow.cpp:412
msgid "You don't have enough money."
msgstr "У вас недостаточно денег."
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:496
+#: src/gui/windows/tradewindow.cpp:498
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
"Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
@@ -6611,9 +6658,8 @@ msgstr "Открыть контекстное меню"
#. TRANSLATORS: input action group
#: src/input/pages/chat.cpp:33
-#, fuzzy
msgid "Main"
-msgstr "Основной шрифт"
+msgstr "Основные"
#. TRANSLATORS: input action name
#: src/input/pages/chat.cpp:39
@@ -6662,50 +6708,43 @@ msgstr "Закрыть все вкладки чата"
#. TRANSLATORS: input action name
#: src/input/pages/chat.cpp:99
-#, fuzzy
msgid "Select general tab"
-msgstr "Выбрать Сервер"
+msgstr "Выбрать вкладку \"Общие\""
#. TRANSLATORS: input action name
#: src/input/pages/chat.cpp:105
-#, fuzzy
msgid "Select debug tab"
-msgstr "Выбрать яйцо"
+msgstr "Выбрать вкладку \"Отладка\""
#. TRANSLATORS: input action name
#: src/input/pages/chat.cpp:111
-#, fuzzy
msgid "Select trade tab"
-msgstr "Включить вкладки торговли"
+msgstr "Выбрать вкладку \"Торговать\""
#. TRANSLATORS: input action name
#: src/input/pages/chat.cpp:117
-#, fuzzy
msgid "Select battle tab"
-msgstr "Включить вкладку боя"
+msgstr "Выбрать вкладку \"Битва\""
#. TRANSLATORS: input action name
#: src/input/pages/chat.cpp:123
-#, fuzzy
msgid "Select gm tab"
-msgstr "Выбрать яйцо"
+msgstr "Выбрать вкладку \"ГМ\""
#. TRANSLATORS: input action name
#: src/input/pages/chat.cpp:129
-#, fuzzy
msgid "Select lang tab"
-msgstr "Включить в чате закладку для языка"
+msgstr "Выбрать вкладку \"Язык\""
#. TRANSLATORS: input action name
#: src/input/pages/chat.cpp:135
msgid "Select party tab"
-msgstr ""
+msgstr "Выбрать вкладку \"Группа\""
#. TRANSLATORS: input action name
#: src/input/pages/chat.cpp:141
-#, fuzzy
msgid "Select guild tab"
-msgstr "Выбрать Сервер"
+msgstr "Выбрать вкладку \"Гильдия\""
#. TRANSLATORS: input action name
#: src/input/pages/chat.cpp:153
@@ -6734,7 +6773,6 @@ msgstr "Следующая строка чата"
#. TRANSLATORS: input action group
#: src/input/pages/chat.cpp:183
-#, fuzzy
msgid "Smiles"
msgstr "Смайлы"
@@ -7385,191 +7423,191 @@ msgid "Item Shortcut %d"
msgstr "Комбинация клавиш быстрого предмета %d"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:36
+#: src/input/pages/windows.cpp:42
msgid "Show Windows Menu"
msgstr "Показать список окон"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:42
+#: src/input/pages/windows.cpp:48
msgid "Hide Windows"
msgstr "Скрытие окон"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:48
+#: src/input/pages/windows.cpp:54
msgid "About Window"
msgstr "Окно \"О программе\""
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:54
+#: src/input/pages/windows.cpp:60
msgid "Bank Window"
msgstr "Окно банка"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:60
+#: src/input/pages/windows.cpp:66
msgid "Help Window"
msgstr "Окно помощи"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:66
+#: src/input/pages/windows.cpp:72
msgid "Status Window"
msgstr "Окно статуса"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:72
+#: src/input/pages/windows.cpp:78
msgid "Inventory Window"
msgstr "Окно инвентаря"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:78
+#: src/input/pages/windows.cpp:84
msgid "Equipment Window"
msgstr "Окно экипировки"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:84
+#: src/input/pages/windows.cpp:90
msgid "Skill Window"
msgstr "Окно навыков"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:90
+#: src/input/pages/windows.cpp:96
msgid "Minimap Window"
msgstr "Окно миникарты"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:96
+#: src/input/pages/windows.cpp:102
msgid "Chat Window"
msgstr "Окно чата"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:102
+#: src/input/pages/windows.cpp:108
msgid "Item Shortcut Window"
msgstr "Окно быстрого использования предметов"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:108
+#: src/input/pages/windows.cpp:114
msgid "Setup Window"
msgstr "Окно настроек"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:114
+#: src/input/pages/windows.cpp:120
msgid "Debug Window"
msgstr "Окно отладки"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:120
+#: src/input/pages/windows.cpp:126
msgid "Social Window"
msgstr "Окно общества"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:126
+#: src/input/pages/windows.cpp:132
msgid "Emote Shortcut Window"
msgstr "Окно эмоций"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:132
+#: src/input/pages/windows.cpp:138
msgid "Outfits Window"
msgstr "Окно нарядов"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:138
+#: src/input/pages/windows.cpp:144
msgid "Shop Window"
msgstr "Окно магазина"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:144
+#: src/input/pages/windows.cpp:150
msgid "Quick drop Window"
msgstr "Окно быстрого бросания предметов"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:150
+#: src/input/pages/windows.cpp:156
msgid "Kill Stats Window"
msgstr "Окно статистики атак"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:156
+#: src/input/pages/windows.cpp:162
msgid "Commands Window"
msgstr "Окно команд"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:162
+#: src/input/pages/windows.cpp:168
msgid "Bot Checker Window"
msgstr "Окно детектора ботов"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:168
+#: src/input/pages/windows.cpp:174
msgid "Who Is Online Window"
msgstr "Окно кто онлайн"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
+#: src/input/pages/windows.cpp:180
msgid "Did you know Window"
msgstr "Окно \"Знаете ли вы...\""
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:186
msgid "Quests Window"
msgstr "Окно квестов"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:192
msgid "Updates Window"
msgstr "Окно обновлений"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:198
+#, fuzzy
+msgid "Cart window"
+msgstr "Окно чата"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/windows.cpp:210
msgid "Previous Social Tab"
msgstr "Предыдущая закладка общества"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:216
msgid "Next Social Tab"
msgstr "Следующая закладка общества"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:222
msgid "Previous Shortcuts tab"
msgstr "Прерыдущая страница быстрого использования"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:228
msgid "Next Shortcuts tab"
msgstr "Следующая страница быстрого использования"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:234
msgid "Previous Commands tab"
msgstr "Прерыдущая страница команд"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:240
msgid "Next Commands tab"
msgstr "Следующая страница команд"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:246
msgid "Previous inventory tab"
msgstr "Предыдущая вкладка инвентаря"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:252
msgid "Next inventory tab"
msgstr "Следующая вкладка инвентаря"
#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
-#, fuzzy
+#: src/input/pages/windows.cpp:258
msgid "Clear drops window"
-msgstr "Очистить окно дропов"
+msgstr "Очистить окно бросания"
#. TRANSLATORS: inventory type name
#: src/inventory.cpp:304
msgid "Storage"
msgstr "Хранилище"
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:309
-msgid "Cart"
-msgstr "Телега"
-
#. TRANSLATORS: command line help
#: src/main.cpp:79
msgid "manaplus [options] [manaplus-file]"