summaryrefslogtreecommitdiff
path: root/po/ru.po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-05-19 23:52:10 +0300
committerAndrei Karas <akaras@inbox.ru>2018-05-19 23:52:10 +0300
commitb56d398bf575459f40fcf27052ab98311af4fcd6 (patch)
tree1e230e426dfe81c35c080e47c83254b6a92120c9 /po/ru.po
parent62f6aea80258af22dd939546c29fcd85c489d965 (diff)
downloadplus-b56d398bf575459f40fcf27052ab98311af4fcd6.tar.gz
plus-b56d398bf575459f40fcf27052ab98311af4fcd6.tar.bz2
plus-b56d398bf575459f40fcf27052ab98311af4fcd6.tar.xz
plus-b56d398bf575459f40fcf27052ab98311af4fcd6.zip
Update translations.
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po1090
1 files changed, 574 insertions, 516 deletions
diff --git a/po/ru.po b/po/ru.po
index bcd43d3a0..b81bc7f57 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
+"Last-Translator: Alexsl <alexlsh@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
"ru/)\n"
"Language: ru\n"
@@ -35,7 +35,7 @@ msgstr ""
"%100>=11 && n%100<=14)? 2 : 3);\n"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
msgid "Visible on map"
msgstr "Видимые на карте"
@@ -54,12 +54,12 @@ msgid "miss"
msgstr "промах"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
msgid "A"
msgstr "О"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
msgid "I"
msgstr "Б"
@@ -71,53 +71,53 @@ msgid "You were killed by %s."
msgstr "Вы были убиты %s."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
msgid "Tried to pick up nonexistent item."
msgstr "Попытка поднять несуществующий предмет."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
msgid "Item is too heavy."
msgstr "Предмет слишком тяжелый."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
msgid "Item is too far away."
msgstr "Предмет слишком далеко."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
msgid "Inventory is full."
msgstr "Инвентарь переполнен."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
msgid "Stack is too big."
msgstr "Слишком много предметов."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
msgid "Item belongs to someone else."
msgstr "Предмет принадлежит кому-то еще."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
msgid "You can't pickup this amount of items."
msgstr "Вы не можете поднять такое количество."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
msgid "Your item stack has max amount."
msgstr "Слишком много предметов в стэке."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
msgid "Unknown problem picking up item."
msgstr "Неизвестная проблема при поднятии предмета."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -128,58 +128,58 @@ msgstr[3] "Вы подняли %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
msgid "xp"
msgstr "опыт"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
msgid "job"
msgstr "работа"
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
msgid "Homun"
msgstr "Гомун"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
msgid "hp"
msgstr "здоровье"
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
msgid "mana"
msgstr "мана"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
#, c-format
msgid "Follow: %s"
msgstr "Следовать за: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
msgid "Follow canceled"
msgstr "Следование отменено"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
#, c-format
msgid "Imitation: %s"
msgstr "Имитация: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
msgid "Imitation canceled"
msgstr "Имитация отменена"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
#, c-format
msgid "You see %s"
msgstr "Вы видите %s"
@@ -417,21 +417,18 @@ msgstr "Ошибка сети"
#. TRANSLATORS: auto adjust settings message
#: src/game.cpp:831
-#, fuzzy
msgid "Auto disable Show beings transparency"
-msgstr "Отображать прозрачность на персонажах и монстрах"
+msgstr ""
#. TRANSLATORS: auto adjust settings message
#: src/game.cpp:852
-#, fuzzy
msgid "Auto lower Particle effects"
-msgstr "Выводить эффекты частиц"
+msgstr ""
#. TRANSLATORS: auto adjust settings message
#: src/game.cpp:873
-#, fuzzy
msgid "Auto enable opacity cache"
-msgstr "Включить прозрачность интерфейса"
+msgstr ""
#. TRANSLATORS: move type in status bar
#: src/gamemodifiers.cpp:149
@@ -818,32 +815,35 @@ msgstr "Отошел"
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
#: src/gui/widgets/tabs/setup_theme.cpp:326
#: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
#: src/gui/windows/changeemaildialog.cpp:171
#: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 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:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
msgid "OK"
msgstr "ОК"
@@ -874,14 +874,14 @@ msgstr "(F) свободная камера"
#. TRANSLATORS: ok dialog button
#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
#: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
msgid "Close"
msgstr "Закрыть"
@@ -931,7 +931,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_misc.cpp:100
#: src/gui/widgets/tabs/setup_perfomance.cpp:74
#: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
msgid "default"
msgstr "По умолчанию"
@@ -1381,9 +1381,9 @@ msgstr "Гильдия: %s"
#. TRANSLATORS: being popup label
#: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
msgid "Clan: %s"
-msgstr "Комментарий: %s"
+msgstr ""
#. TRANSLATORS: being popup label
#: src/gui/popups/beingpopup.cpp:222
@@ -1579,9 +1579,9 @@ msgstr "Разговор"
#. TRANSLATORS: input action name
#. TRANSLATORS: npc context menu item
#: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
#: src/resources/db/npcdb.cpp:170
msgid "Buy"
@@ -1599,7 +1599,7 @@ msgstr "Купить"
#. TRANSLATORS: npc context menu item
#: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
#: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
#: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
#: src/resources/db/npcdb.cpp:172
msgid "Sell"
@@ -1669,8 +1669,8 @@ msgstr "Накормить"
#. TRANSLATORS: character rename button
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
msgid "Rename"
msgstr "Переименовать"
@@ -1694,7 +1694,7 @@ msgstr "Бросить лут"
#. TRANSLATORS: inventory button
#. TRANSLATORS: popup menu item
#: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
#: 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
@@ -1728,6 +1728,7 @@ msgstr "Добавить имя в чат"
#. TRANSLATORS: connection dialog button
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: register dialog. button.
#. TRANSLATORS: setup button
@@ -1760,10 +1761,11 @@ msgstr "Добавить имя в чат"
#: src/gui/windows/changepassworddialog.cpp:58
#: src/gui/windows/charcreatedialog.cpp:115
#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
#: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
msgid "Cancel"
msgstr "Отмена"
@@ -1819,7 +1821,7 @@ msgstr "Удалить"
#. TRANSLATORS: warp to map item
#. TRANSLATORS: warp select button
#: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
msgid "Warp"
msgstr "Прыгнуть"
@@ -1841,7 +1843,7 @@ msgstr "Восстановить камеру"
#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
#: src/gui/windows/outfitwindow.cpp:61
msgid "Outfits"
msgstr "Наряды"
@@ -1873,8 +1875,10 @@ msgstr "Изменить заклинание"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
msgid "Clear"
msgstr "Очистить"
@@ -2045,9 +2049,9 @@ msgstr "Добавить к торговле все"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
msgid "Store"
msgstr "Сохранить"
@@ -2084,8 +2088,8 @@ msgstr "Поместить в крафт..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
msgid "Retrieve"
msgstr "Получить"
@@ -2124,10 +2128,10 @@ msgstr "Получить все"
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
#: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
#: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
msgid "Use"
msgstr "Использовать"
@@ -2280,7 +2284,7 @@ msgstr "Выбор типа применения умения"
#. TRANSLATORS: skill cast type
#. TRANSLATORS: button in input settings tab
#: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
msgid "Default"
msgstr "По умолчанию"
@@ -2316,7 +2320,7 @@ msgstr "Пренебречь"
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
msgid "Ignore"
msgstr "Игнорировать"
@@ -2422,8 +2426,8 @@ msgstr "Поставить защиту"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
msgid "Drop..."
msgstr "Бросить..."
@@ -2438,7 +2442,7 @@ msgstr "Бросить все"
#. TRANSLATORS: long button name for drops window.
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
msgid "Drop"
msgstr "Бросить"
@@ -2497,7 +2501,7 @@ msgstr "Хранилище"
#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
#: src/resources/inventory/inventory.cpp:375
msgid "Cart"
msgstr "Телега"
@@ -2715,10 +2719,10 @@ msgstr "Создать подчиненного"
#. TRANSLATORS: info header
#. TRANSLATORS: info message
#: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
msgid "Info"
msgstr "Сведения"
@@ -2910,7 +2914,7 @@ msgstr "Чат"
#. TRANSLATORS: input action group
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
#: src/gui/widgets/tabs/setup_chat.cpp:325
#: src/gui/widgets/tabs/setup_misc.cpp:500
#: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3223,7 +3227,7 @@ msgstr "Точка дороги"
#. TRANSLATORS: status bar label
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
#: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
msgid "Max"
msgstr "Макс"
@@ -3235,9 +3239,9 @@ msgstr "Макс"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
msgid "+"
msgstr "+"
@@ -3251,7 +3255,7 @@ msgstr "Уровень: %u"
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
#: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
#, c-format
msgid "Money: %s"
@@ -3278,9 +3282,9 @@ msgstr "Открыть ссылку"
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
#: src/gui/windows/tradewindow.cpp:89
msgid "Add"
msgstr "Добавить"
@@ -3292,10 +3296,10 @@ msgstr "Добавить"
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
msgid "Quit"
msgstr "Выход"
@@ -3304,24 +3308,24 @@ msgstr "Выход"
#. You may change this symbol if your language uses another.
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
msgid "-"
msgstr "-"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Цена: %s / Всего: %s"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
msgid "Edit"
msgstr "Изменить"
@@ -3406,54 +3410,51 @@ msgstr ""
#. TRANSLATORS: clan name label
#: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
msgid "Clan name"
-msgstr "Мигать именем"
+msgstr ""
#. TRANSLATORS: clan master name label
#: src/gui/widgets/tabs/clanwindowtabs.cpp:70
-#, fuzzy
msgid "Master name"
-msgstr "Название карты:"
+msgstr ""
#. TRANSLATORS: clan map name label
#: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
msgid "Map name"
-msgstr "Название карты:"
+msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
msgid "Music:"
msgstr "Музыка:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
msgid "Map:"
msgstr "Карта:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
msgid "Map name:"
msgstr "Название карты:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
msgid "Minimap:"
msgstr "Миникарта:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
msgid "Cursor:"
msgstr "Курсор:"
@@ -3464,224 +3465,232 @@ msgstr "Количество эффектов:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
msgid "Map actors count:"
msgstr "Кол-во. объектов:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "Кол-во. объектов:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
#: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
msgid "Player Position:"
msgstr "Позиция игрока:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
msgid "Draw calls:"
msgstr "Вызовов рис.:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
msgid "Texture binds:"
msgstr "Биндингов текстур:"
#. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
#. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
#, c-format
msgid "%d LPS"
msgstr "%d Лог./сек."
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (Программно)"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
#, c-format
msgid "%d FPS (normal OpenGL)"
msgstr "%d FPS (нормальный OpenGL)"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
#, c-format
msgid "%d FPS (safe OpenGL)"
msgstr "%d FPS (безопасный OpenGL)"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
#, c-format
msgid "%d FPS (mobile OpenGL ES)"
msgstr "%d FPS (мобильный OpenGL ES)"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
#, c-format
msgid "%d FPS (mobile OpenGL ES 2)"
msgstr "%d FPS (мобильный OpenGL ES 2)"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
#, c-format
msgid "%d FPS (modern OpenGL)"
msgstr "%d FPS (новый OpenGL)"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
#, c-format
msgid "%d FPS (SDL2 default)"
msgstr "%d FPS (SDL2 по_умолчанию)"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
msgid "Textures count:"
msgstr "Количество текстур:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
#, c-format
msgid "Particle count: %d"
msgstr "Количество частиц: %d"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
msgid "Target:"
msgstr "Цель:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
msgid "Target Id:"
msgstr "Id цели:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
msgid "Target type:"
msgstr "Тип цели:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
msgid "Target level:"
msgstr "Уровень цели:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
msgid "Target race:"
msgstr "Раса цели:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
msgid "Target party:"
msgstr "Группа цели:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
msgid "Target guild:"
msgstr "Гильдия цели:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
msgid "Attack delay:"
msgstr "Задержка атаки:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
msgid "Minimal hit:"
msgstr "Минимальный удар:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
msgid "Maximum hit:"
msgstr "Максимальный удар:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
msgid "Critical hit:"
msgstr "Критический удар:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
msgid "Karma:"
msgstr "Карма:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
msgid "Manner:"
msgstr "Манеры:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
msgid "Effects:"
msgstr "Эффекты:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
msgid "Target Level:"
msgstr "Уровень цели:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
msgid "Target Party:"
msgstr "Группа цели:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
msgid "Target Guild:"
msgstr "Гильдия цели:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
#, c-format
msgid "Ping: %s ms"
msgstr "Пинг: %s мс."
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
#, c-format
msgid "In: %d bytes/s"
msgstr "Вх.: %d байт/сек."
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
#, c-format
msgid "Out: %d bytes/s"
msgstr "Исх.: %d байт/сек."
@@ -3789,46 +3798,58 @@ msgstr "Звук приватного сообщения"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_audio.cpp:143
#, fuzzy
-msgid "Guild / party / clan message sound"
-msgstr "Звук сообщения в гильдии или группе"
+msgid "Guild message sound"
+msgstr "Звук глобального сообщения"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_audio.cpp:148
+#, fuzzy
+msgid "Party message sound"
+msgstr "Звук ошибки"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:153
+#, fuzzy
+msgid "Clan message sound"
+msgstr "Звук глобального сообщения"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:158
msgid "Highlight message sound"
msgstr "Звук подсветки"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:153
+#: src/gui/widgets/tabs/setup_audio.cpp:163
msgid "Global message sound"
msgstr "Звук глобального сообщения"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:158
+#: src/gui/widgets/tabs/setup_audio.cpp:168
msgid "Error message sound"
msgstr "Звук ошибки"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:163
+#: src/gui/widgets/tabs/setup_audio.cpp:173
msgid "Trade request sound"
msgstr "Звук обмена"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:168
+#: src/gui/widgets/tabs/setup_audio.cpp:178
msgid "Show window sound"
msgstr "Звук открытия окна"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:173
+#: src/gui/widgets/tabs/setup_audio.cpp:183
msgid "Hide window sound"
msgstr "Звук закрытия окна"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:183
+#: src/gui/widgets/tabs/setup_audio.cpp:193
msgid "Enable mumble voice chat"
msgstr "Включить голосовой чат mumble"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
msgid "Download music"
msgstr "Скачать музыку"
@@ -4385,27 +4406,27 @@ msgid "Assign"
msgstr "Назначить"
#. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
msgid "Unassign"
msgstr "Снять назначение"
#. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
msgid "Reset all keys"
msgstr "Сбросить все кнопки"
#. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
msgid "Input"
msgstr "Ввод"
#. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
msgid "Key Conflict(s) Detected."
msgstr "Обнаружен(ы) конфликт(ы) клавиш."
#. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4416,50 +4437,50 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
#: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
msgid "unknown"
msgstr "неизвестно"
#. TRANSLATORS: joystick settings tab label
#: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
msgid "Press the button to start calibration"
msgstr "Нажмите кнопку, чтобы начать калибровку"
#. TRANSLATORS: joystick settings tab button
#: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
msgid "Calibrate"
msgstr "Калибровать"
#. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
msgid "Detect joysticks"
msgstr "Определение джойстика"
#. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
msgid "Enable joystick"
msgstr "Использовать джойстик"
#. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
msgid "Use joystick if client window inactive"
msgstr "Использовать джойстик если игра свернута"
#. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
msgid "Joystick"
msgstr "Джойстик"
#. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
msgid "Stop"
msgstr "Стоп"
#. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
msgid "Rotate the stick and don't press buttons"
msgstr "Вращайте стик и не нажимайте другие кнопки"
@@ -4779,7 +4800,7 @@ msgstr "Включить напоминание о весе"
#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
#: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
msgid "Shop"
msgstr "Магазин"
@@ -4988,14 +5009,14 @@ msgstr "Для данного сервера моды не существуют"
#. TRANSLATORS: texture compression type
#. TRANSLATORS: confirm dialog button
#: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
msgid "No"
msgstr "Нет"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
msgid "Performance"
msgstr "Производительность"
@@ -5334,19 +5355,19 @@ msgstr "Разрешить шептание"
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
#: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
msgid "Delete"
msgstr "Удалить"
#. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
msgid "Relations"
msgstr "Связи"
#. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
msgid "When ignoring:"
msgstr "Когда игнорируется:"
@@ -5418,8 +5439,8 @@ msgstr "i"
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
msgid "Theme"
msgstr "Тема"
@@ -5446,8 +5467,8 @@ msgstr "Тема изменена"
#. TRANSLATORS: ok dialog message
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
msgid "Restart your client for the change to take effect."
msgstr "Перезагрузите игру дабы изменения вступили в силу."
@@ -5539,9 +5560,9 @@ msgstr "Ограничить кадр/с:"
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
msgid "Alt FPS limit: "
msgstr "Альтер. ограничить кадр/с: "
@@ -5551,50 +5572,50 @@ msgid "Detect best mode"
msgstr "Найти лучший режим"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
msgid "High DPI"
msgstr "Высокий DPI"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
msgid "Show cursor"
msgstr "Показывать курсор"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
msgid "Custom cursor"
msgstr "Игровой курсор"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
msgid "Enable resize"
msgstr "Разрешить менять размер окна"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
msgid "No frame"
msgstr "Без рамки"
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
msgid "Video"
msgstr "Видео"
#. TRANSLATORS: video settings label
#. TRANSLATORS: video settings label value
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "None"
msgstr "Нет"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
@@ -5602,7 +5623,7 @@ msgstr ""
"удалось!"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
@@ -5610,43 +5631,43 @@ msgstr ""
"также не удалось!"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
msgid "Switching to Full Screen"
msgstr "Переключение в полноэкранный режим"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
msgid "Restart needed for changes to take effect."
msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
msgid "Changing to OpenGL"
msgstr "Переключение на OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
msgid "Applying change to OpenGL requires restart."
msgstr "Для изменения режима OpenGL необходима перезагрузки игры."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
msgid "Custom resolution (example: 1024x768)"
msgstr "Свое разрешение (например: 1024х768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
msgid "Enter new resolution: "
msgstr "Введите новое разрешение: "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
msgid "Screen Resolution Changed"
msgstr "Разрешение экрана изменено"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
@@ -5984,7 +6005,7 @@ msgstr "СПР"
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
msgid "Help"
msgstr "Помощь"
@@ -6039,7 +6060,7 @@ msgstr "СН"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
msgid "Equipment"
msgstr "Снаряжение"
@@ -6151,9 +6172,8 @@ msgstr "Почта"
#. TRANSLATORS: short button name for clan window.
#: src/gui/windowmenu.cpp:190
-#, fuzzy
msgid "CL"
-msgstr "П"
+msgstr ""
#. TRANSLATORS: short button name for server info window.
#: src/gui/windowmenu.cpp:195
@@ -6185,20 +6205,20 @@ msgstr "ОПЦ"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
msgid "Setup"
msgstr "Настройка"
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
#: src/gui/windows/outfitwindow.cpp:631
#, c-format
msgid "Key: %s"
msgstr "Клавиша: %s"
#. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
#, c-format
msgid "Money in bank: %s"
msgstr "Денег в банке: %s"
@@ -6209,7 +6229,7 @@ msgid "Withdraw"
msgstr "Забрать"
#. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
msgid "Deposit"
msgstr "Положить"
@@ -6219,20 +6239,20 @@ msgid "Create items"
msgstr "Создание предметов"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
msgid "Amount:"
msgstr "Количество:"
#. TRANSLATORS: buy dialog button
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
msgid "Create"
msgstr "Создать"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
msgid "Filter:"
msgstr "Фильтр:"
@@ -6287,15 +6307,15 @@ msgstr "Адрес E-mail не совпадает."
#. TRANSLATORS: error message header
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
msgid "Error"
msgstr "Ошибка"
@@ -6310,7 +6330,7 @@ msgstr "Изменить пароль"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
msgid "Password:"
msgstr "Пароль:"
@@ -6351,8 +6371,8 @@ msgstr "Новый персонаж"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
msgid "Name:"
msgstr "Имя:"
@@ -6367,16 +6387,16 @@ msgstr "^"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: outfits window button
#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
msgid ">"
msgstr ">"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
#, c-format
msgid "Please distribute %d points"
msgstr "Распределите очки (%d)"
@@ -6385,71 +6405,71 @@ msgstr "Распределите очки (%d)"
#. You may change this symbol if your language uses another.
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
msgid "<"
msgstr "<"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
msgid "Hair color:"
msgstr "Цвет волос:"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
msgid "Hair style:"
msgstr "Стрижка:"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
msgid "Race:"
msgstr "Раса:"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
msgid "Look:"
msgstr "Внешность:"
#. TRANSLATORS: one char size female character gender
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
msgid "F"
msgstr "Д"
#. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
msgid "M"
msgstr "М"
#. TRANSLATORS: one char size other character gender
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
msgid "O"
msgstr "Н"
#. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
msgid "U"
msgstr "?"
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
msgid "Your name needs to be at least 4 characters."
msgstr "Имя должно содержать не менее четырех символов."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
msgid "Character stats OK"
msgstr "Данные персонажа в порядке"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
#, c-format
msgid "Please remove %d points"
msgstr "Снимите очки (%d)"
@@ -6476,36 +6496,37 @@ msgid "Switch"
msgstr "Сменить"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
msgid "Password"
msgstr "Пароль"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
#: src/gui/windows/updaterwindow.cpp:196
msgid "Play"
msgstr "Играть"
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "Сменить логин"
+
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
#, c-format
msgid "Account %s"
msgstr "Аккаунт %s"
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr "Пожалуйста, установите новый пин код"
-
#. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
msgid "Please enter new name"
msgstr "Пожалуйста, введите новое имя"
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -6516,27 +6537,27 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
msgid "Incorrect password"
msgstr "Неправильный пароль"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
msgid "Enter your email for deleting character"
msgstr "Введите ваш email для удаления персонажа"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
msgid "Enter email:"
msgstr "Введите email:"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
msgid "Enter password for deleting character"
msgstr "Введите пароль для удаления персонажа"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
msgid "Enter password:"
msgstr "Введите пароль:"
@@ -6578,7 +6599,7 @@ msgid "Antagonist"
msgstr ""
#. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
msgid "Yes"
msgstr "Да"
@@ -6619,42 +6640,42 @@ msgid "Connect"
msgstr "Соединиться"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Use same ip"
msgstr "Использовать один ip"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
msgid "Address:"
msgstr "Адрес:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
msgid "Port:"
msgstr "Порт:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
msgid "Server type:"
msgstr "Тип сервера:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
msgid "Description:"
msgstr "Описание:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
msgid "Online list url:"
msgstr "URL онлайн списка:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
msgid "Packet version:"
msgstr "Версия пакетов:"
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
msgid "Please at least type both the address and the port of the server."
msgstr "Пожалуйста введите хотя бы адрес и порт сервера."
@@ -6689,7 +6710,7 @@ msgstr "Т"
#. TRANSLATORS: unknown hosts group name
#. TRANSLATORS: unknown skills tab name
#. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
#: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
msgid "Unknown"
msgstr "Неизвестный"
@@ -6724,7 +6745,7 @@ msgstr "Вставка"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 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
@@ -6735,93 +6756,93 @@ msgid "Equip"
msgstr "Надеть"
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
msgid "C"
msgstr "П"
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
msgid "S"
msgstr "М"
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
msgid "E"
msgstr "С"
#. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
msgid "Insert card request"
msgstr "Вопрос о вставке карты"
#. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
#, c-format
msgid "Insert %s into %s?"
msgstr "Вставить %s в %s?"
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
msgid "All"
msgstr "Всё"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
msgid "Select amount of items to trade."
msgstr "Сколько предметов продать."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
msgid "Select amount of items to drop."
msgstr "Сколько предметов сбросить."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
msgid "Select amount of items to store."
msgstr "Укажите количество вещей для хранения."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
msgid "Select amount of items to send."
msgstr "Укажите количество для отправки."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
msgid "Select amount of items to craft."
msgstr "Выберите количество для крафта."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
msgid "Select amount of items to store to cart."
msgstr "Укажите количество вещей для хранения в прицепе."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
msgid "Select amount of items to retrieve."
msgstr "Укажите количество вещей для изъятия."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
msgid "Select amount of items to retrieve from cart."
msgstr "Укажите количество вещей для изъятия из прицепа."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
msgid "Select amount of items to split."
msgstr "Сколько предметов разделить."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
msgid "Add to buy shop."
msgstr "Добавить в список покупки."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
msgid "Add to sell shop."
msgstr "Добавить в список продажи."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
msgid "Unknown."
msgstr "Неизвестно."
@@ -6831,44 +6852,44 @@ msgid "Reset stats"
msgstr "Сбросить стат."
#. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
msgid "Reset timer"
msgstr "Сбросить таймер"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
#, 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:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
#, c-format
msgid "Avg Exp: %s"
msgstr "Средний опыт: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
#, 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:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
#, 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:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -6877,8 +6898,8 @@ msgstr[1] "Опыт за %d мин.: %s"
msgstr[2] "Опыт за %d мин.: %s"
msgstr[3] "Опыт за %d мин.: %s"
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
@@ -6888,40 +6909,40 @@ msgstr[2] "Время до следующего уровня в мин. %d: %s"
msgstr[3] "Время до следующего уровня в мин. %d: %s"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
msgid "Last kill exp:"
msgstr "Опыт за последнее убийство:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
#, c-format
msgid "Level: %d at %f%%"
msgstr "Уровень: %d на %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
#, c-format
msgid "Exp: %s/%s Left: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
#, c-format
msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
#, c-format
msgid " Time for next level: %s"
msgstr " Время до следующего уровня: %s"
#. TRANSLATORS: login dialog name
#. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
msgid "Login"
msgstr "Вход"
@@ -6944,29 +6965,29 @@ msgstr "Сменить сервер"
#. TRANSLATORS: register dialog name
#. TRANSLATORS: register dialog. button.
#. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
#: src/gui/windows/registerdialog.cpp:63
#: src/gui/windows/serverinfowindow.cpp:128
msgid "Register"
msgstr "Регистрация"
#. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
msgid "Custom update host"
msgstr "Польз. сайт обновлений"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
msgid "Server:"
msgstr "Сервер:"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
msgid "Open register url"
msgstr "Открыть ссылку регистрации"
#. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
msgid "default updates"
msgstr "нормальные обновления"
@@ -6987,14 +7008,14 @@ msgstr "Для:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
msgid "Subject:"
msgstr "Заголовок:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
msgid "Money:"
msgstr "Деньги:"
@@ -7005,7 +7026,7 @@ msgstr "Премет:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
msgid "Message:"
msgstr "Сообщение:"
@@ -7029,22 +7050,22 @@ msgid "Get attach"
msgstr "Получить вложение"
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
msgid "Reply"
msgstr "Ответить"
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
msgid "Time:"
msgstr "Время:"
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
msgid "From:"
msgstr "От:"
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
msgid "Get money"
msgstr "Получить деньги"
@@ -7054,24 +7075,29 @@ msgid "Refresh"
msgstr "Обновить"
#. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
msgid "New"
msgstr "Новое"
#. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr "Получить золото"
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
msgid "Return"
msgstr "Вернуть"
#. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
msgid "Open"
msgstr "Открыть"
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
#. TRANSLATORS: status bar name
#: src/gui/windows/ministatuswindow.cpp:73
msgid "health bar"
@@ -7213,62 +7239,62 @@ msgid "Switch character"
msgstr "Сменить персонажа"
#. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
msgid "Confirm:"
msgstr "Подтвердите:"
#. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
msgid "Male"
msgstr "Мужчина"
#. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
msgid "Female"
msgstr "Женщина"
#. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
msgid "Email:"
msgstr "Email:"
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
#, c-format
msgid "The username needs to be at least %u characters long."
msgstr "Имя пользователя должно содержать не менее %u символов."
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
#, c-format
msgid "The username needs to be less than %u characters long."
msgstr "Имя пользователя должно содержать менее %u символов."
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
#, c-format
msgid "The password needs to be at least %u characters long."
msgstr "Пароль должен содержать не менее %u символов."
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
#, c-format
msgid "The password needs to be less than %u characters long."
msgstr "Пароль должен содержать не более %u символов."
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
msgid "Passwords do not match."
msgstr "Пароли не совпадают."
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
#: src/net/eathena/loginrecv.cpp:120
msgid "Incorrect email."
msgstr "Неправильный email."
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
msgid "Email too long."
msgstr "Email слишком длинный."
@@ -7278,48 +7304,53 @@ msgid "Choose Your Server"
msgstr "Выберите сервер"
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
msgid "Load"
msgstr "Загрузить"
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Выбор сервера *** БЕЗОПАСНЫЙ РЕЖИМ ***"
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server *** SOFTWARE RENDER MODE ***"
+msgstr "Выбор сервера *** БЕЗОПАСНЫЙ РЕЖИМ ***"
+
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
msgid "Use same ip for game sub servers"
msgstr "Использовать одинаковый IP для игровых суб-серверов"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Получение списка серверов...%2.2f%%"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
msgid "Waiting for server..."
msgstr "Ожидание ответа от сервера..."
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
msgid "Preparing download"
msgstr "Подготовка к загрузке"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
msgid "Error retreiving server list!"
msgstr "Не удалось получить список серверов!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
msgid "requires a newer version"
msgstr "требуется более новая версия"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
#, c-format
msgid "requires v%s"
msgstr "требуется v%s"
@@ -7377,72 +7408,72 @@ msgid "Reset Windows"
msgstr "Сбросить расположение окон"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
msgid "Personal Shop"
msgstr "Свой магазин"
#. TRANSLATORS: shop window button
#. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
msgid "Publish"
msgstr "Опубликовать"
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
msgid "Announce"
msgstr "Анонс"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
msgid "Show links in announce"
msgstr "Показывать ссылки"
#. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
msgid "Please enter new shop name"
msgstr "Пожалуйста, введите имя вашего магазина"
#. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
msgid "Unpublish"
msgstr "Убрать"
#. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
msgid "error: player busy"
msgstr "ошибка: игрок занят"
#. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
msgid "error: Can't sell this item"
msgstr "ошибка: нельзя продать предмет"
#. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
msgid "error: Can't buy this item"
msgstr "ошибка: нельзя купить предмет"
#. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
#, 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:1027
+#: src/gui/windows/shopwindow.cpp:1039
#, 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:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
msgid "Request for Trade"
msgstr "Запрос на Торговлю"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
#, c-format
msgid "Personal Shop - %s"
msgstr "Персональный магазин - %s"
@@ -7459,46 +7490,46 @@ msgid "Skill points available: %d"
msgstr "Очков навыков осталось: %d"
#. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
#, c-format
msgid "Skill Set %d"
msgstr "Навык %d"
#. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
#, c-format
msgid "Skill %d"
msgstr "Навык %d"
#. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
#, c-format
msgid "Skill %u"
msgstr "Навык %u"
#. TRANSLATORS: skills dialog. skill level
#. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
#, c-format
msgid "Lvl: %d"
msgstr "Уровень: %d"
#. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
#, c-format
msgid "Failed skill: %s"
msgstr "Неудача навыка: %s"
#. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
#, c-format
msgid "Add text to skill %s"
msgstr "Добавить текст к скилу %s"
#. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
msgid "Text: "
msgstr "Текст: "
@@ -7708,35 +7739,35 @@ msgid "Trade: You"
msgstr "Торговля: Вы"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
#, c-format
msgid "You get %s"
msgstr "Вы получаете %s."
#. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
msgid "Change"
msgstr "Сменить"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
msgid "You give:"
msgstr "Вы отдаете:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
msgid "You don't have enough money."
msgstr "У вас недостаточно денег."
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
"Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
"объектов более одного раза."
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
msgid "Failed adding item. You can not trade equipped items."
msgstr "Ошибка добавления предмета. Вы не можете обменивать одетые предметы."
@@ -7811,7 +7842,7 @@ msgid "Change Login"
msgstr "Сменить логин"
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
msgid "Choose World"
msgstr "Выберите сервер"
@@ -8986,9 +9017,8 @@ msgstr "Окно быстрых настроек"
#. TRANSLATORS: input action name
#: src/input/pages/windows.cpp:208
-#, fuzzy
msgid "Clan window"
-msgstr "Прицеп"
+msgstr ""
#. TRANSLATORS: input action name
#: src/input/pages/windows.cpp:220
@@ -9202,33 +9232,33 @@ msgstr "Подключение к серверу прервано. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
msgid "Character rename error."
msgstr "Ошибка изменения имени персонажа."
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
msgid "Character renamed."
msgstr "Персонаж переименован."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
msgid "Rename not allowed."
msgstr "Изменение имени запрещено."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
msgid "New name is not set."
msgstr "Новое имя не указано."
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
msgid "Character not found."
msgstr "Персонаж не найден."
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "Невозможно удалить персонажа."
@@ -9258,13 +9288,13 @@ msgid "Work in progress."
msgstr "Идет работа."
#. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
#, c-format
msgid "Message could not be sent, channel %s is not exists."
msgstr "Сообщение не может быть отправлено, т.к. канал %s не существует."
#. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
#, c-format
msgid "Can't open channel. Channel %s is not exists."
msgstr "Не возможно открыть канал. Канал %s не существует."
@@ -9281,7 +9311,7 @@ msgid "Do you accept %s and %s as parents?"
msgstr "Вы принимаете %s и %s как своих родителей?"
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
msgid "Got disconnected from server!"
msgstr "Отключено от сервера!"
@@ -9537,108 +9567,108 @@ msgid "You were killed by unknown source."
msgstr "Вы были убиты неизвестным."
#. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
#, c-format
msgid "Unknown skill error: %d"
msgstr "Неизвестная ошибка навыков: %d"
#. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
#, c-format
msgid "Unknown skill error: %d."
msgstr "Неисвестная ошибка умений: %d."
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
msgid "You have not yet reached a high enough lvl!"
msgstr "У Вас недостаточный уровень!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
msgid "Insufficient HP!"
msgstr "Недостаточно ОЖ!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
msgid "Insufficient SP!"
msgstr "Недостаточно Маны!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
msgid "You have no memos!"
msgstr "У Вас нет записей!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
msgid "You cannot do that right now!"
msgstr "Вы не можете сделать это сейчас!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
msgid "Seems you need more money... ;-)"
msgstr "Похоже, Вам нужно больше денег... ;-)"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
msgid "You cannot use this skill with that kind of weapon!"
msgstr "Вы не можете использовать этот навык с данным видом оружия!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
msgid "You need another red gem!"
msgstr "Вам нужен другой красный камень!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
msgid "You need another blue gem!"
msgstr "Вам нужен другой синий камень!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
msgid "You're carrying to much to do this!"
msgstr "Вы несёте слишком много, чтобы сделать это!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
msgid "Fail summon."
msgstr "Ошибка вызова монстра."
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
msgid "Need spirits."
msgstr "Необходима сущьность."
#. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
#, c-format
msgid "Need equipment %s."
msgstr "Необходимо снаряжение %s."
#. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
#, c-format
msgid "Need equipment %s and amount %d"
msgstr "Нужно снаряжение %s в количестве %d"
#. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
#, c-format
msgid "Need item %s."
msgstr "Нужен предмет %s."
#. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
#, c-format
msgid "Need item %s and amount %d"
msgstr "Нужен предмет %s в количестве %d."
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
msgid "Skill failed!"
msgstr "Ошибка умения!"
#. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
msgid "Select warp target"
msgstr "Выберите точку назначения"
@@ -9746,8 +9776,55 @@ msgstr "Не удалось ничего украсть..."
msgid "Poison had no effect..."
msgstr "Яд не подействовал..."
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "Введите пароль:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+#, fuzzy
+msgid "New pincode"
+msgstr "Пожалуйста, установите новый пин код"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+#, fuzzy
+msgid "Enter new pincode"
+msgstr "Пожалуйста, установите новый пин код"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "Сменить сообщение"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
msgid "About"
msgstr "О Программе"
@@ -9767,7 +9844,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd файл_строка_цвета файл_назначения"
#. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
msgid "File uploaded"
msgstr "Файл выгружен"
@@ -9775,9 +9852,8 @@ msgstr "Файл выгружен"
#. TRANSLATORS: clear fonts cache message
#: src/progs/manaplus/actions/actions.cpp:1100
#: src/progs/manaplus/actions/actions.cpp:1115
-#, fuzzy
msgid "Cache cleared"
-msgstr "Кеш очищен"
+msgstr ""
#. TRANSLATORS: uptime command
#: src/progs/manaplus/actions/actions.cpp:1313
@@ -9795,9 +9871,8 @@ msgstr "Изображений:"
#. TRANSLATORS: dump command
#: src/progs/manaplus/actions/actions.cpp:1388
#: src/progs/manaplus/actions/actions.cpp:1400
-#, fuzzy
msgid "Orphaned resource images:"
-msgstr "Изображений:"
+msgstr ""
#. TRANSLATORS: dump environment command
#: src/progs/manaplus/actions/actions.cpp:1499
@@ -9806,48 +9881,40 @@ msgstr "Переменные среды сохранены"
#. TRANSLATORS: upload config chat message
#: src/progs/manaplus/actions/actions.cpp:1638
-#, fuzzy
msgid "Config uploaded to:"
-msgstr "Файл выгружен"
+msgstr ""
#. TRANSLATORS: upload config chat message
#: src/progs/manaplus/actions/actions.cpp:1648
-#, fuzzy
msgid "Server config Uploaded to:"
-msgstr "Значение настройки для этого сервера: %s"
+msgstr ""
#. TRANSLATORS: upload log chat message
#: src/progs/manaplus/actions/actions.cpp:1658
-#, fuzzy
msgid "Log uploaded to:"
-msgstr "Информация о выгруженном логе:"
+msgstr ""
#. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1943
msgid ""
"Last seen disabled. Enable in players / collect players ID and seen log."
msgstr ""
-"Сбор информации о пользователя отключен. Включите его в игроки / собирать ид "
-"игроков и лог встреч."
#. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1964
msgid "You have never seen this nick."
-msgstr "Вам не встречался этот ник."
+msgstr ""
#. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
#, c-format
msgid "Last seen for %s: %s"
msgstr "Последняя встреча с %s: %s"
#. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
-#, fuzzy
+#: src/progs/manaplus/actions/actions.cpp:1983
msgid "You have not seen this nick before."
-msgstr "Вам не встречался этот ник."
+msgstr ""
#. TRANSLATORS: whisper send
#: src/progs/manaplus/actions/chat.cpp:279
@@ -10098,57 +10165,57 @@ msgid "Accepting incoming trade requests"
msgstr "Принимать предложения о торговле"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
msgid "Logging in"
msgstr "Авторизация"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
msgid "Entering game world"
msgstr "Входим в игровой мир"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
msgid "Requesting characters"
msgstr "Получение списка персонажей"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
msgid "Changing game servers"
msgstr "Смена игрового сервера"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
msgid "Password Change"
msgstr "Изменить Пароль"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
msgid "Email Change"
msgstr "Сменить Email"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
msgid "Email changed successfully!"
msgstr "Email изменен!"
@@ -11433,12 +11500,3 @@ msgstr "%d секунда"
#, c-format
msgid "%d seconds"
msgstr "%d секунд"
-
-#~ msgid "Resource orphaned images:"
-#~ msgstr "Удаленных изображений:"
-
-#~ msgid "Uploaded config into:"
-#~ msgstr "Информация о выгруженном конфиге:"
-
-#~ msgid "Uploaded server config into:"
-#~ msgstr "Информация о выгруженном конфиге сервера:"