summaryrefslogtreecommitdiff
path: root/po/ru.po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-28 21:27:12 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-28 21:27:12 +0300
commite7fb50b1a53426553c882e5b40c4b793e4f90af4 (patch)
treeb20f69e331679f6590f76006b9e3c428fe9b821f /po/ru.po
parent63a5cd54d570fd0709f1b9ddcd3053d4602f36bc (diff)
downloadmv-e7fb50b1a53426553c882e5b40c4b793e4f90af4.tar.gz
mv-e7fb50b1a53426553c882e5b40c4b793e4f90af4.tar.bz2
mv-e7fb50b1a53426553c882e5b40c4b793e4f90af4.tar.xz
mv-e7fb50b1a53426553c882e5b40c4b793e4f90af4.zip
Update translations.
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po1079
1 files changed, 536 insertions, 543 deletions
diff --git a/po/ru.po b/po/ru.po
index b5c734dea..0e9cea643 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-14 09:12+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-02-23 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
"language/ru/)\n"
@@ -38,7 +38,7 @@ msgid "Accepting incoming trade requests"
msgstr "Принимать предложения о торговле"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr "Видимые на карте"
@@ -47,68 +47,68 @@ msgstr "Видимые на карте"
msgid "Human"
msgstr "Человек"
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr "уклонение"
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr "промах"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "О"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "Б"
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr "Вас убил %s"
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr "Попытка поднять несуществующий предмет."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr "Предмет слишком тяжелый."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr "Предмет слишком далеко"
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr "Инвентарь переполнен."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr "Слишком много предметов."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr "Предмет принадлежит кому-то еще."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr "Неизвестная проблема при поднятии предмета."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -117,387 +117,387 @@ msgstr[1] "Вы подняли %d [@@%d|%s@@]."
msgstr[2] "Вы подняли %d [@@%d|%s@@]."
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr "опыт"
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr "работа"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr "(D) движения по умолчанию"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr "(I) обратное движение"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr "(c) обычное движение иногда с сумасшедшими движениями"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr "(C) движение с сумасшедшими движениями"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr "(d) нормальные и сумасшедшие движения"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr "(?) неизвестное движение"
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr "(%u) сумасшедшее движение %u"
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr "(a) пользовательские сумасшедшие движения"
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr "(?) неизвестные сумасшедшие движения"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr "(0) обычное движение к цели"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr "(1) движение к цели на расстояние 1"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr "(2) движение к цели на расстояние 2"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr "(3) движение к цели на расстояние 3"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr "(5) движение к цели на расстояние 5"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr "(7) движение к цели на расстояние 7"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr "(A) движение к цели на расстояние атаки"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr "(a) атака лучника"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr "(B) движение к цели на расстояние атаки - 1"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr "(?) неизвестное движение к цели"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr "(D) следование по умолчанию"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr "(R) относительное следование"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr "(M) зеркальное следование"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr "(P) следование как животное"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr "(?) неизвестное следование"
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr "(?) неизвестная атака"
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr "(D) обычная атака"
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr "(s) переключение атаки без щита"
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr "(S) переключение атаки со щитом"
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr "(G) идти и атаковать"
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr "(A) идти, атаковать, собирать"
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr "(d) без автоатаки"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr "(S) поднятие в области 1x1"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr "(D) поднятие из области 2x1"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) поднятие из области спереди 2x3"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr "(3) поднятие из области 3x3"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr "(g) движение и поднятие на расстоянии 4"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr "(g) движение и поднятие на расстоянии 8"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr "(A) движение и поднятие на максимальном расстоянии"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr "(?) неизвестный режим поднятия"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr "(N) обычный режим карты"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr "(D) отладочный режим карты"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr "(u) специальный режим карты"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr "(U) специальный режим карты 2"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr "(e) режим пустой карты"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr "(b) черно-белый режим карты"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr "(f) использовать #flar для атаки"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr "(c) использовать #chiza для атаки"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr "(I) использовать #ingrav для атаки"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr "(F) использовать #frillyar для атаки"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) использовать #upmarmu для атаки"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr "(?) неизвестная магическая атака"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr "(a) атаковать всех игроков"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr "(f) атаковать всех кроме друзей"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr "(b) атаковать врагов"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr "(d) не атаковать игроков"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr "(?) pvp атака"
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr "(D) имитация по умолчанию"
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr "(O) имитация нарядов"
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr "(?) неизвестная имитация"
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr "Отошел"
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr "(O) возле компьютера"
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr "(A) отошел"
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr "(?) неизвестный режим отошел"
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr "(G) игровая камера"
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr "(F) свободная камера"
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr "Игровые модификаторы включены"
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr "Игровые модификаторы выключены"
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr "Игровые модификаторы в неизвестном положении"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr "Следовать за: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr "Следование отменено"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr "Имитация: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr "Имитация отменена"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr "Вы видите %s"
@@ -535,32 +535,32 @@ msgstr "Плавающий пузырек"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "Настройка"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr "Производительность"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Видео"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr "Тема"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Помощь"
@@ -573,41 +573,41 @@ msgstr "Помощь"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "Закрыть"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Авторизация"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Входим в игровой мир"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr "Получение списка персонажей"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr "Смена игрового сервера"
@@ -622,12 +622,12 @@ msgstr "Смена игрового сервера"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -635,65 +635,65 @@ msgid "Error"
msgstr "Ошибка"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr "Изменить Пароль"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr "Сменить Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr "Email изменен!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr "Регистрация удалена"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтесь в любое время..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s не существует, и не может быть создано! Выход."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr "Некорректный сервер обновленмй: %s."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr "Ошибка создания директории для обновлений!"
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr "Открыть страницу поддержки?"
@@ -943,99 +943,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd файлстрокацвета файлназначения"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr "Общие"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr "Отладка"
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr "Снимок экрана сохранен как %s"
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr "Ошибка при сохранении снимка экрана!"
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr "Соединение с сервером потеряно."
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr "Ошибка сети"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "По умолчанию"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
msgid "black"
msgstr "черный"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr "красный"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr "зеленый"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr "синий"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr "золотой"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr "желтый"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr "розовый"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr "фиолетовый"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr "серый"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr "коричневый"
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "радуга 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "радуга 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "радуга 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Общая Магия"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Магия Жизни"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Боевая Магия"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Магия Трансформации"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Магия Природы"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Астральная магия"
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1071,46 +1126,61 @@ msgstr "В черном списке"
msgid "Enemy"
msgstr "Враг"
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
-msgstr "По умолчанию"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr "не сорт."
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr "по цене"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
msgid "by name"
msgstr "по названию"
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr "по ID"
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr "по весу"
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr "по кол-ву."
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr "по типу"
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Без цели"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Разрешить цель"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Необходима цель"
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1257,8 +1327,8 @@ msgstr "Разговор"
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "Купить"
@@ -1355,12 +1425,12 @@ msgstr "Добавить имя в чат"
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1432,7 +1502,7 @@ msgstr "Передвинуть камеру"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr "Наряды"
@@ -1445,7 +1515,7 @@ msgstr "Очистить наряд"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr "Заклинания"
@@ -1501,7 +1571,7 @@ msgstr "Запретить режим \"отошел\""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr "Покинуть"
@@ -1582,8 +1652,8 @@ msgstr "Добавить к торговле все"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr "Сохранить"
@@ -1614,7 +1684,7 @@ msgstr "Сохранить все"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr "Получить"
@@ -1647,8 +1717,8 @@ msgstr "Получить все"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Использовать"
@@ -1682,8 +1752,8 @@ msgstr "Скопировать в чат"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr "(по умолчанию)"
@@ -1839,8 +1909,8 @@ msgstr "Поставить защиту"
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "Снять"
@@ -1848,16 +1918,16 @@ msgstr "Снять"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Надеть"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr "Бросить..."
@@ -1871,15 +1941,15 @@ msgstr "Бросить все"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "Бросить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "Разделить"
@@ -2035,10 +2105,10 @@ msgstr "Выбор OK"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "Выход"
@@ -2600,7 +2670,7 @@ msgstr "Страница вниз"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2627,9 +2697,8 @@ msgstr "Выбор2"
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "Удалить"
@@ -2665,7 +2734,7 @@ msgstr "Основное"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr "Горячие клавиши"
@@ -2673,7 +2742,7 @@ msgstr "Горячие клавиши"
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr "Окна"
@@ -2689,7 +2758,7 @@ msgstr "Смайлы"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr "Чат"
@@ -2912,7 +2981,7 @@ msgstr "Уровень: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2932,7 +3001,7 @@ msgstr "Открыть ссылку"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr "Изменить"
@@ -2985,7 +3054,7 @@ msgstr "ГМ"
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr "Гильдия"
@@ -2996,142 +3065,142 @@ msgid "Lang"
msgstr "Язык"
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr "Аудио"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr "Основные настройки"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr "Включить Аудио"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr "Включить музыку"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr "Включить игровые эффекты"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr "Включить эффекты интерфейса"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "Громкость эффектов"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "Громкость музыки"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr "Включить плавный переход музыки"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr "Частота аудио"
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr "моно"
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr "стерео"
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr "окружение"
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr "окружение+центр+lfe"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr "Аудио каналы"
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr "Звуковые эффекты"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr "Звук информационного диалога"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr "Звук вопроса"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr "Звук криватного сообщения"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr "Звук сообщения в гильдии или группе"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr "Звук подсветки"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr "Звук глобального сообщения"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr "Звук ошибки"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr "Звук обмена"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr "Звук открытия окна"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr "Звук закрытия окна"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr "Включить голосовой чат mumble"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr "Скачать музыку"
@@ -3429,7 +3498,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr "неизвестно"
@@ -3588,7 +3657,7 @@ msgstr "Прокручивать прицел по монстрам"
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3756,9 +3825,9 @@ msgstr "Включить напоминание о весе"
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "Магазин"
@@ -4146,252 +4215,252 @@ msgid "When ignoring:"
msgstr "Когда игнорируется:"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr "Очень маленький (8)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr "Очень маленький (9)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr "Маленький (10)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr "Маленький (11)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr "Средний (12)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr "Нормальный (13)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr "Большой (14)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr "Большой (15)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr "Большой (16)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr "Большой (17)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr "Большой (18)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr "Большой (19)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr "Очень большой (20)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr "Очень большой (21)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr "Очень большой (22)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr "Огромный (23)"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr "Китайский"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr "Чешский"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr "Английский"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr "Финский"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr "Французский"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr "Немецкий"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr "Индонезийский"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr "Итальянский"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr "Польский"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr "Японский"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr "Голландский (Бельгийский/Фламандский)"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr "Португальский"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr "Португальский (Бразильский)"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr "Русский"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr "Испанский (Кастильский)"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr "Турецкий"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr "Тема интерфейса"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr "Основной шрифт"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr "Язык"
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr "Жирный шрифт"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr "Шрифт частиц"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr "Шрифт помощи"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr "Безопасный шрифт"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr "Шрифт НИП"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr "Японский шрифт"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr "Китайский шрифт"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr "Размер шрифта"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr "Размер шрифта НИП (NPC)"
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr "i"
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr "Название:"
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr "Авторские права:"
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr "Информация о теме"
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr "Тема изменена"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4728,178 +4797,169 @@ msgid "Allow screensaver to run"
msgstr "Разрешить запуск скринсейвера"
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr "КО"
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr "Кто онлайн"
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr "СПР"
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr "КВ"
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr "Квесты"
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr "ДБ"
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr "Окно детектора ботов"
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr "СА"
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr "Статистика убийств"
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr "Смайлы"
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr "ЧАТ"
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr "СО"
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "Состояние"
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr "СН"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Снаряжение"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr "ИНВ"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "Инвентарь"
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr "КАР"
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr "УМ"
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "Умения"
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr "СПЕ"
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr "Особые"
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr "ОБЩ"
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr "Общество"
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr "ГК"
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr "ЗАК"
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr "БР"
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr "ВЗ"
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr "Знаете ли вы"
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr "МАГ"
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr "НАР"
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr "ОТЛ"
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr "ОКН"
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr "ОПЦ"
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4921,31 +4981,21 @@ msgstr "Сбросить"
msgid "Result"
msgstr "Результат"
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr "не сорт."
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr "по цене"
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr "Создание предметов"
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Цена: %s / Всего: %s"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr "Количество:"
@@ -4955,8 +5005,8 @@ msgstr "Количество:"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr "+"
@@ -4967,8 +5017,8 @@ msgstr "+"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr "-"
@@ -4976,9 +5026,9 @@ msgstr "-"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "Создать"
@@ -4987,7 +5037,7 @@ msgstr "Создать"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5086,7 +5136,7 @@ msgstr "Новый персонаж"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "Имя:"
@@ -5147,7 +5197,7 @@ msgstr "Женщина"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "Распределите очки (%d)"
@@ -5163,17 +5213,17 @@ msgid "Look:"
msgstr "Внешность:"
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "Имя должно содержать не менее четырех символов."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "Данные персонажа в порядке"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "Снимите очки (%d)"
@@ -5202,7 +5252,7 @@ msgstr "Сменить героя"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr "Играть"
@@ -5263,35 +5313,20 @@ msgstr "Введите пароль для удаления персонажа"
msgid "Enter password:"
msgstr "Введите пароль:"
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr "радуга 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr "радуга 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr "радуга 3"
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Присутствуют: %s; Всего %d игроков."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr "Вы прошептали %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr "животное %s'а"
@@ -5537,51 +5572,51 @@ msgstr "Автоматически открывать это окно"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "ОК"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr "Редактирование сервера"
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr "Соединиться"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr "Адрес:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr "Порт:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr "Тип сервера:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr "Описание:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr "URL онлайн списка:"
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr "Пожалуйста введите хотя бы адрес и порт сервера"
@@ -5601,47 +5636,47 @@ msgid "Did you know..."
msgstr "Знаете ли вы..."
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr "Всё"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "Сколько предметов продать."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "Сколько предметов сбросить."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr "Укажите количество вещей для хранения."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr "Укажите количество вещей для изъятия."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "Сколько предметов разделить."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr "Добавить в список покупки."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr "Добавить в список продажи."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr "Неизвестно."
@@ -5895,7 +5930,7 @@ msgstr "Применить"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5997,53 +6032,53 @@ msgid "Do you really want to sell %s?"
msgstr "Вы действительно хотите продать %s?"
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr "Выберите сервер"
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr "Загрузить"
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Выбор сервера *** БЕЗОПАСНЫЙ РЕЖИМ ***"
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr "Использовать одинаковый IP для игровых суб-серверов"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Получение списка серверов...%2.2f%%"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr "Ожидание ответа от сервера..."
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr "Подготовка к загрузке"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr "Не удалось получить список серверов!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr "требуется более новая версия"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr "требуется v%s"
@@ -6124,277 +6159,277 @@ msgid "Skill %d"
msgstr "Умение %d"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Пользователь %s приглашен в гильдию %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr "Выход из гильдии %s запрошен."
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr "Приглашение игрока в Гильдию"
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "Кого вы хотите пригласить в гильдию %s?"
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr "Покинуть Гильдию?"
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Вы действительно хотите выйти из гильдии %s?"
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr "Членов: %u/%u"
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr "Игроков: %u/%u"
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr "Группа"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr "Пригласить пользователя %s в группу."
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr "Запрошен выход из группы %s."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr "Пригласить пользователя в группу"
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "Кого вы хотите пригласить в группу %s?"
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr "Покинуть группу?"
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "Вы действительно хотите покинуть группу %s?"
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr "Видимых игроков: %d"
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr "Нав"
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr "Порталов: %u/%u"
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr "Атк"
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr "Приоритетные монстры"
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr "Атакуемые монстры"
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr "Игнорируемые монстры"
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr "Подб"
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr "Подбирать предметы"
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr "Игнорировать предметы"
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr "Друзей: %u/%u"
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr "Создать группу"
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr "И"
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr "Д"
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr "Пригласить"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr "Принято приглашение в группу от %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr "Отклонено приглашение в группу от %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Принято приглашение в гильдию от %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Отклонено приглашение в гильдию от %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr "Создание гильдии с именем %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr "Создание группы с именем %s."
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr "Имя гильдии"
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr "Выберите имя для гильдии."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr "Получено приглашение в гильдию, но оно не первое."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s приглашает присоединиться к гильдии %s."
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr "Принять приглашение в гильдию"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr "Получено приглашение в группу, но оно не первое."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr "Вас приглашают в группу."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Вас приглашают присоединиться к группе %s."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s приглашает Вас к себе в группу."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s приглашает присоединиться к %s группе."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr "Принять приглашение в группу"
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr "Не удалось создать группу. Вы уже состоите в другой."
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr "Имя группы"
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr "Выберите имя будущей группы."
@@ -6436,113 +6471,68 @@ msgstr "Очки персонажа: %d"
msgid "Correction points: %d"
msgstr "Очков навыков: %d"
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr "Без цели"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr "Разрешить цель"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr "Необходима цель"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr "Общая Магия"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr "Магия Жизни"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr "Боевая Магия"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr "Магия Трансформации"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr "Магия Природы"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr "Астральная магия"
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr "Редактор команд"
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr "Магия"
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr "Другое"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr "Символ:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr "Команда:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr "Комментарий:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr "Тип цели:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr "Картинка:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr "Мана:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr "Уровень Магии:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr "Школа Магии:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr "Уровень школы:"
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr "Сохранить"
@@ -6572,7 +6562,7 @@ msgid "Trade: You"
msgstr "Торговля: Вы"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr "Вы получаете %s."
@@ -6588,12 +6578,12 @@ msgid "You give:"
msgstr "Вы отдаете:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr "У вас недостаточно денег"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
"Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
@@ -6665,17 +6655,17 @@ msgid "Who Is Online - Update"
msgstr "Кто онлайн - обновление"
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr "Выбрать Сервер"
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr "Сменить логин"
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr "Выберите сервер"
@@ -6897,7 +6887,7 @@ msgstr ""
"Невозможно создать персонажа. Скорее всего, такое имя уже используется."
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr "Некорректное имя."
@@ -7055,58 +7045,58 @@ msgid "Experience sharing unknown."
msgstr "Политика распределения опыта неизвестна."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr "Учетная запись не найдена. Попробуйте снова."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr "Старый пароль указан неверно."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr "Новый пароль слишком короткий."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr "Неизвестная ошибка."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr "Незарегистрированный ID"
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr "Неверный пароль"
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr "Учетная запись просрочена."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr "Получен отказ от сервера."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr "Вас навсегда забанили. Пожалуйста, свяжитесь с командой ГМ-ов."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr "Клиент устарел"
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7115,22 +7105,22 @@ msgstr ""
"Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr "Сервер переполнен"
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr "Это имя пользователя уже занято."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr "Неправильный email."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr "Пользователь удален"
@@ -7806,7 +7796,7 @@ msgstr "Безопасный OpenGL"
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "безымянный"
@@ -7850,5 +7840,8 @@ msgstr "Неизвестный предмет"
msgid "pet"
msgstr "животное"
-#~ msgid "(no sound)"
-#~ msgstr "(без звука)"
+#~ msgid "SPE"
+#~ msgstr "СПЕ"
+
+#~ msgid "Specials"
+#~ msgstr "Особые"