summaryrefslogtreecommitdiff
path: root/po/ru.po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-05-22 04:28:37 +0300
committerAndrei Karas <akaras@inbox.ru>2011-05-22 04:28:37 +0300
commit797733823a46e1423334c3c693f0071286bac2a7 (patch)
treed209e9d0c629dcef2e16a436f4c61d2db9c5d18a /po/ru.po
parent7c34adebb068549ca6a56bdf1b211398a0b1de11 (diff)
downloadmv-797733823a46e1423334c3c693f0071286bac2a7.tar.gz
mv-797733823a46e1423334c3c693f0071286bac2a7.tar.bz2
mv-797733823a46e1423334c3c693f0071286bac2a7.tar.xz
mv-797733823a46e1423334c3c693f0071286bac2a7.zip
Rebuild language files.
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po640
1 files changed, 329 insertions, 311 deletions
diff --git a/po/ru.po b/po/ru.po
index b52586e5e..5ad1a8095 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,226 +2,228 @@
# Copyright (C) YEAR The ManaPlus Developers
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 23:29+0300\n"
+"POT-Creation-Date: 2011-05-22 04:22+0300\n"
"PO-Revision-Date: 2011-05-09 20:33+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
+"ru/)\n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-#: src/actorspritemanager.cpp:1022
+#: src/actorspritemanager.cpp:1028
msgid "Visible on map"
msgstr "Видимые на карте"
-#: src/being.cpp:495
+#: src/being.cpp:504
msgid "dodge"
msgstr "уворот"
-#: src/being.cpp:495
+#: src/being.cpp:504
msgid "miss"
msgstr "промах"
-#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:760 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
msgid "Setup"
msgstr "Настройка"
-#: src/client.cpp:826
+#: src/client.cpp:834
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
-#: src/client.cpp:857
+#: src/client.cpp:865
msgid "Logging in"
msgstr "Авторизация"
-#: src/client.cpp:890
+#: src/client.cpp:898
msgid "Entering game world"
msgstr "Входим в игровой мир"
-#: src/client.cpp:982
+#: src/client.cpp:990
msgid "Requesting characters"
msgstr "Получение списка персонажей"
-#: src/client.cpp:1013
+#: src/client.cpp:1021
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
-#: src/client.cpp:1023
+#: src/client.cpp:1031
msgid "Changing game servers"
msgstr "Смена игрового сервера"
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
+#: src/client.cpp:1066 src/client.cpp:1073 src/client.cpp:1210
#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
#: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
-#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:389
#: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
#: src/net/tmwa/charserverhandler.cpp:204
msgid "Error"
msgstr "Ошибка"
-#: src/client.cpp:1074
+#: src/client.cpp:1082
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
-#: src/client.cpp:1101
+#: src/client.cpp:1109
msgid "Password Change"
msgstr "Изменить Пароль"
-#: src/client.cpp:1102
+#: src/client.cpp:1110
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
-#: src/client.cpp:1121
+#: src/client.cpp:1129
msgid "Email Change"
msgstr "Сменить Email"
-#: src/client.cpp:1122
+#: src/client.cpp:1130
msgid "Email changed successfully!"
msgstr "Email изменен!"
-#: src/client.cpp:1142
+#: src/client.cpp:1150
msgid "Unregister Successful"
msgstr "Регистрация удалена"
-#: src/client.cpp:1143
+#: src/client.cpp:1151
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтесь в любое время..."
-#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
+#: src/client.cpp:1340 src/client.cpp:1370 src/client.cpp:1414
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s не существует, и не может быть создано! Выход."
-#: src/client.cpp:1535
+#: src/client.cpp:1543
#, c-format
msgid "Invalid update host: %s"
msgstr "Некорректный сервер обновлений: %s"
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1577 src/client.cpp:1583
msgid "Error creating updates directory!"
msgstr "Ошибка создания директории для обновлений!"
-#: src/client.cpp:1596
+#: src/client.cpp:1604
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
-#: src/commandhandler.cpp:289
+#: src/commandhandler.cpp:299
msgid "Unknown command."
msgstr "Неизвестная команда."
-#: src/commandhandler.cpp:389
+#: src/commandhandler.cpp:399
msgid "Cannot send empty whispers!"
msgstr "Нельзя отправлять пустые сообщения!"
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:407
#, c-format
msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
msgstr ""
-"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка"
-" уже создана, или этот игрок вы сами."
+"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
+"уже создана, или этот игрок вы сами."
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:427
#, c-format
msgid "Requesting to join channel %s."
msgstr "Запрос на присоединение к каналу %s."
-#: src/commandhandler.cpp:433 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:123
msgid "Party name is missing."
msgstr "Не указано название группы"
-#: src/commandhandler.cpp:444
+#: src/commandhandler.cpp:454
msgid "Guild name is missing."
msgstr "Не задано имя гильдии."
-#: src/commandhandler.cpp:457 src/commandhandler.cpp:564
-#: src/commandhandler.cpp:605 src/commandhandler.cpp:635
+#: src/commandhandler.cpp:467 src/commandhandler.cpp:574
+#: src/commandhandler.cpp:615 src/commandhandler.cpp:645
msgid "Please specify a name."
msgstr "Пожалуйста укажите имя"
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:508
msgid "Return toggles chat."
msgstr "Enter переключает вас на окно чата."
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:508
msgid "Message closes chat."
msgstr "Сообщение закрывает чат."
-#: src/commandhandler.cpp:509
+#: src/commandhandler.cpp:519
msgid "Return now toggles chat."
msgstr "Теперь Return переключает чат."
-#: src/commandhandler.cpp:515
+#: src/commandhandler.cpp:525
msgid "Message now closes chat."
msgstr "Теперь сообщение закрывает чат."
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:553
msgid "friend"
msgstr "друг"
-#: src/commandhandler.cpp:548
+#: src/commandhandler.cpp:558
msgid "disregarded"
msgstr "пренебрегаемый"
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:563
msgid "neutral"
msgstr "нейтральный"
-#: src/commandhandler.cpp:572
+#: src/commandhandler.cpp:582
#, c-format
msgid "Player already %s!"
msgstr "Игрок уже %s!"
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:596
#, c-format
msgid "Player successfully %s!"
msgstr "Игрок удачно %s!"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:604
#, c-format
msgid "Player could not be %s!"
msgstr "Игрок не может быть %s!"
-#: src/commandhandler.cpp:616
+#: src/commandhandler.cpp:626
msgid "Player wasn't ignored!"
msgstr "Игрок не был игнорируемым!"
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:633
msgid "Player no longer ignored!"
msgstr "Игрок больше не игнорируется!"
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:635
msgid "Player could not be unignored!"
msgstr "Игрок не может быть удален из списка игнорирования!"
-#: src/commandhandler.cpp:642
+#: src/commandhandler.cpp:652
msgid "Player already erased!"
msgstr "Игрок и так уже удален!"
-#: src/commandhandler.cpp:653
+#: src/commandhandler.cpp:663
msgid "Player successfully erased!"
msgstr "Игрок удален!"
-#: src/commandhandler.cpp:655
+#: src/commandhandler.cpp:665
msgid "Player could not be erased!"
msgstr "Игрок не может быть удален!"
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:958 src/commandhandler.cpp:1004
#, c-format
msgid "Client uptime: %s"
msgstr "Время работы клиента: %s"
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -229,7 +231,7 @@ msgstr[0] "%d неделя"
msgstr[1] "%d недели"
msgstr[2] "%d недель"
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:977
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -237,7 +239,7 @@ msgstr[0] "%d день"
msgstr[1] "%d дня"
msgstr[2] "%d дней"
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:985
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -245,7 +247,7 @@ msgstr[0] "%d час"
msgstr[1] "%d часа"
msgstr[2] "%d часов"
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:993
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -253,7 +255,7 @@ msgstr[0] "%d минута"
msgstr[1] "%d минуты"
msgstr[2] "%d минут"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:1001
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -261,64 +263,74 @@ msgstr[0] "%d секунда"
msgstr[1] "%d секунды"
msgstr[2] "%d секунд"
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1080
msgid "font cache size"
msgstr "размер кеша шрифта"
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1092
msgid "Cache size:"
msgstr "Размер кеша:"
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1096
msgid "Created:"
msgstr "Создано:"
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1098
msgid "Deleted:"
msgstr "Удалено:"
+#: src/commandhandler.cpp:1145 src/commandhandler.cpp:1152
+msgid "Resource images:"
+msgstr ""
+
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource orphaned images:"
+msgstr ""
+
#: src/commandhandler.h:40
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
+msgstr ""
+"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
+"\"0\"."
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:232 src/gui/widgets/chattab.cpp:398
msgid "General"
msgstr "Общие"
-#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:236 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
msgid "Debug"
msgstr "Отладка"
-#: src/game.cpp:444
+#: src/game.cpp:449
msgid "Screenshot saved as "
msgstr "Снимок экрана сохранен как "
-#: src/game.cpp:452
+#: src/game.cpp:457
msgid "Saving screenshot failed!"
msgstr "Ошибка при сохранении снимка экрана!"
-#: src/game.cpp:491
+#: src/game.cpp:496
msgid "The connection to the server was lost."
msgstr "Соединение с сервером потеряно."
-#: src/game.cpp:505
+#: src/game.cpp:510
msgid "Network Error"
msgstr "Ошибка сети"
-#: src/game.cpp:1023
+#: src/game.cpp:1028
msgid "Ignoring incoming trade requests"
msgstr "Игнорировать предложения о торговле"
-#: src/game.cpp:1030
+#: src/game.cpp:1035
msgid "Accepting incoming trade requests"
msgstr "Принимать предложения о торговле"
-#: src/game.cpp:1405
+#: src/game.cpp:1410
msgid "Could Not Load Map"
msgstr "Не удалось загрузить карту"
-#: src/game.cpp:1406
+#: src/game.cpp:1411
#, c-format
msgid "Error while loading %s"
msgstr "Ошибка во время загрузки %s"
@@ -346,19 +358,19 @@ msgstr "Окно детектора ботов"
msgid "Name"
msgstr "Имя"
-#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:581
#: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
msgid "Attack"
msgstr "Атака"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:253
#: src/keyboardconfig.cpp:60
msgid "Talk"
msgstr "Разговор"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:638
msgid "Move"
msgstr "Движение"
@@ -371,14 +383,14 @@ msgid "Reset"
msgstr "Сбросить"
#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:641
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:645
msgid "Buy"
msgstr "Купить"
-#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
-#: src/gui/sell.cpp:322
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300
+#: src/gui/selldialog.cpp:85 src/gui/selldialog.cpp:322
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Цена: %s / Всего: %s"
@@ -387,7 +399,7 @@ msgstr "Цена: %s / Всего: %s"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
-#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/selldialog.cpp:88 src/gui/statuswindow.cpp:938
msgid "+"
msgstr "+"
@@ -395,19 +407,20 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
-#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/selldialog.cpp:89 src/gui/statuswindow.cpp:950
msgid "-"
msgstr "-"
#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
-#: src/gui/serverdialog.cpp:264 src/keyboardconfig.cpp:277
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/selldialog.cpp:91 src/gui/serverdialog.cpp:282
+#: src/keyboardconfig.cpp:277
msgid "Quit"
msgstr "Выход"
-#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
-#: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
-#: src/gui/statuswindow.cpp:968
+#: src/gui/buydialog.cpp:97 src/gui/selldialog.cpp:92
+#: src/gui/statuswindow.cpp:488 src/gui/statuswindow.cpp:537
+#: src/gui/statuswindow.cpp:937 src/gui/statuswindow.cpp:968
msgid "Max"
msgstr "Макс"
@@ -416,28 +429,29 @@ msgstr "Макс"
msgid "Shop"
msgstr "Магазин"
-#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
-#: src/gui/sell.cpp:90
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:646 src/gui/selldialog.cpp:51
+#: src/gui/selldialog.cpp:58 src/gui/selldialog.cpp:90
msgid "Sell"
msgstr "Продать"
#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
-#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
-#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
-#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
-#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
+#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
+#: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
+#: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
msgid "Cancel"
msgstr "Отмена"
@@ -473,7 +487,7 @@ msgstr "Адрес E-mail не совпадает"
msgid "Change Password"
msgstr "Изменить пароль"
-#: src/gui/changepassworddialog.cpp:62 src/gui/login.cpp:92
+#: src/gui/changepassworddialog.cpp:62 src/gui/logindialog.cpp:92
#: src/gui/register.cpp:74 src/gui/unregisterdialog.cpp:54
msgid "Password:"
msgstr "Пароль:"
@@ -504,7 +518,7 @@ msgstr "Новый пароль не совпадает."
msgid "Create Character"
msgstr "Создать персонажа"
-#: src/gui/charcreatedialog.cpp:71 src/gui/login.cpp:91
+#: src/gui/charcreatedialog.cpp:71 src/gui/logindialog.cpp:91
#: src/gui/register.cpp:73
msgid "Name:"
msgstr "Имя:"
@@ -603,7 +617,7 @@ msgstr "Введите пароль для удаления персонажа"
msgid "Enter password:"
msgstr "Введите пароль:"
-#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
msgid "Delete"
@@ -679,7 +693,7 @@ msgid "rainbow 3"
msgstr "радуга 3"
#: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
-#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/logindialog.cpp:76 src/gui/setup_players.cpp:216
#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
#: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
@@ -708,10 +722,10 @@ msgstr "Да"
msgid "No"
msgstr "Нет"
-#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
-#: src/gui/popupmenu.cpp:601
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:141
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:360 src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:604
msgid "Ignore"
msgstr "Игнорировать"
@@ -860,18 +874,18 @@ msgstr "Исх.: %d байт/сек."
#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
-#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
+#: src/gui/tradewindow.cpp:82 src/gui/tradewindow.cpp:84
msgid "OK"
msgstr "ОК"
-#: src/gui/equipmentwindow.cpp:73 src/gui/windowmenu.cpp:71
+#: src/gui/equipmentwindow.cpp:76 src/gui/windowmenu.cpp:71
msgid "Equipment"
msgstr "Снаряжение"
-#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
+#: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1651
msgid "Unequip"
msgstr "Снять"
@@ -880,7 +894,7 @@ msgid "Help"
msgstr "Помощь"
#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:524
#: src/gui/shopwindow.cpp:109
msgid "Close"
msgstr "Закрыть"
@@ -915,31 +929,31 @@ msgid "id"
msgstr "ид"
#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
-#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
msgid "Equip"
msgstr "Надеть"
#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
-#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
-#: src/gui/popupmenu.cpp:1624
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1656
msgid "Use"
msgstr "Использовать"
#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
+#: src/gui/popupmenu.cpp:1659
msgid "Drop..."
msgstr "Бросить"
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
-#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
+#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
msgid "Split"
msgstr "Разделить"
#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:485
msgid "Outfits"
msgstr "Наряды"
@@ -948,17 +962,17 @@ msgid "Weight:"
msgstr "Вес:"
#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
-#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
msgid "Store"
msgstr "Сохранить"
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
msgid "Retrieve"
msgstr "Получить"
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
-#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
+#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
#: src/gui/windowmenu.cpp:94
msgid "Drop"
msgstr "Бросить"
@@ -1122,44 +1136,44 @@ msgstr "?"
msgid "Time before jacko spawn: jacko spawning"
msgstr "Время до появляения Jacko: должен появится"
-#: src/gui/login.cpp:57
+#: src/gui/logindialog.cpp:57
msgid "Normal"
msgstr "Нормально"
-#: src/gui/login.cpp:58
+#: src/gui/logindialog.cpp:58
msgid "Auto Close"
msgstr "Авт. закрыть"
-#: src/gui/login.cpp:59
+#: src/gui/logindialog.cpp:59
msgid "Skip"
msgstr "Пропустить"
-#: src/gui/login.cpp:84 src/gui/login.cpp:120
+#: src/gui/logindialog.cpp:84 src/gui/logindialog.cpp:120
msgid "Login"
msgstr "Вход"
-#: src/gui/login.cpp:88 src/gui/serverdialog.cpp:231
+#: src/gui/logindialog.cpp:88 src/gui/serverdialog.cpp:241
#: src/gui/widgets/chattab.cpp:171
msgid "Server:"
msgstr "Сервер:"
-#: src/gui/login.cpp:93
+#: src/gui/logindialog.cpp:93
msgid "Custom update host"
msgstr "Польз. сайт обновлений"
-#: src/gui/login.cpp:107
+#: src/gui/logindialog.cpp:107
msgid "Remember username"
msgstr "Запомнить логин"
-#: src/gui/login.cpp:108
+#: src/gui/logindialog.cpp:108
msgid "Update:"
msgstr "Обновления:"
-#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/logindialog.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
msgid "Register"
msgstr "Регистрация"
-#: src/gui/login.cpp:119
+#: src/gui/logindialog.cpp:119
msgid "Change Server"
msgstr "Сменить сервер"
@@ -1219,7 +1233,7 @@ msgstr "Применить"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:526
msgid "Clear"
msgstr "Очистить"
@@ -1258,274 +1272,281 @@ msgstr "Сначала снять"
msgid "Away outfit"
msgstr "наряд отсутствия"
-#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
-#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
+#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/widgets/tradetab.cpp:42
msgid "Trade"
msgstr "Торговать"
-#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:345
msgid "Whisper"
msgstr "Приват"
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:585
msgid "Heal"
msgstr "Лечить"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:592
msgid "Be friend"
msgstr "Подружиться"
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
-#: src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:148
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:626
msgid "Disregard"
msgstr "Пренебреч"
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
-#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
-#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:152
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:355 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:597 src/gui/popupmenu.cpp:605
+#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:619
msgid "Erase"
msgstr "Стереть"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
-#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:365
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:624
msgid "Unignore"
msgstr "Не игнорировать"
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:612 src/gui/popupmenu.cpp:628
#: src/playerrelations.cpp:404
msgid "Completely ignore"
msgstr "@@ignore|Полностью игнорировать@@"
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:636
msgid "Follow"
msgstr "Следовать"
-#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:637
msgid "Imitation"
msgstr "Имитировать"
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:658
msgid "Invite to party"
msgstr "Пригласить в группу"
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:663
msgid "Kick from party"
msgstr "Выкинуть из группы"
-#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:677
msgid "Kick from guild"
msgstr "Выкинуть из гильдии"
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:679
msgid "Change pos in guild"
msgstr "Сменить позицию в гильдии"
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:685
msgid "Invite to guild"
msgstr "Пригласить в гильдию"
-#: src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:233
msgid "Kick player"
msgstr "Кикнуть игрока"
-#: src/gui/popupmenu.cpp:234
+#: src/gui/popupmenu.cpp:235
msgid "Nuke"
msgstr "Уничтожить"
-#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:639
+#, fuzzy
+msgid "Show Items"
+msgstr "Показать уровень"
+
+#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:1828
msgid "Undress"
msgstr "Раздеть"
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:270
msgid "Kick"
msgstr "Кикнуть"
-#: src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:281
msgid "Remove from attack list"
msgstr "Удалить из списка атаки"
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:287
msgid "Add to priority attack list"
msgstr "Добавить в приоритетный список"
-#: src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:289
msgid "Add to attack list"
msgstr "Добавить в список атаки"
-#: src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:292
msgid "Add to ignore list"
msgstr "Добавить в список игнорирования"
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:305 src/gui/popupmenu.cpp:427
msgid "Add name to chat"
msgstr "Добавить имя в чат"
-#: src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:453
msgid "Pick up"
msgstr "Поднять"
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
msgid "Add to chat"
msgstr "Добавить в чат"
-#: src/gui/popupmenu.cpp:468
+#: src/gui/popupmenu.cpp:471
msgid "Map Item"
msgstr "Элмент карты"
-#: src/gui/popupmenu.cpp:469
+#: src/gui/popupmenu.cpp:472
msgid "Rename"
msgstr "Переименовать"
-#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
msgid "Remove"
msgstr "Удалить"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:487
msgid "Load old outfits"
msgstr "Загрузить старые наряды"
-#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:503 src/gui/windowmenu.cpp:93
msgid "Spells"
msgstr "Заклинания"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:505
msgid "Load old spells"
msgstr "Загрузить старые заклинания"
-#: src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:506
msgid "Edit spell"
msgstr "Изменить заклинание"
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:532
msgid "Disable highlight"
msgstr "Отключить уведомление"
-#: src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:537
msgid "Enable highlight"
msgstr "Включить уведомление"
-#: src/gui/popupmenu.cpp:539
+#: src/gui/popupmenu.cpp:542
msgid "Dont remove name"
msgstr "Не скрывать имя"
-#: src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:547
msgid "Remove name"
msgstr "Скрывать имя"
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:552
msgid "Enable away"
msgstr "Рарешить режим отошел"
-#: src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:557
msgid "Disable away"
msgstr "Запретить режим отошел"
-#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+#: src/gui/popupmenu.cpp:563 src/gui/socialwindow.cpp:1019
msgid "Leave"
msgstr "Покинуть"
-#: src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:698
msgid "Change guild position"
msgstr "Сменить позицию в гильдии"
-#: src/gui/popupmenu.cpp:1105
+#: src/gui/popupmenu.cpp:1115
msgid "Rename map sign "
msgstr "Переименовать знак на карте"
-#: src/gui/popupmenu.cpp:1106
+#: src/gui/popupmenu.cpp:1116
msgid "Name: "
msgstr "Имя: "
-#: src/gui/popupmenu.cpp:1460
+#: src/gui/popupmenu.cpp:1492
msgid "Add to trade"
msgstr "Добавить к торговли"
-#: src/gui/popupmenu.cpp:1466
+#: src/gui/popupmenu.cpp:1498
msgid "Add to trade 10"
msgstr "Добавить к торговле 10"
-#: src/gui/popupmenu.cpp:1469
+#: src/gui/popupmenu.cpp:1501
msgid "Add to trade half"
msgstr "Добавить к торговле половину"
-#: src/gui/popupmenu.cpp:1471
+#: src/gui/popupmenu.cpp:1503
msgid "Add to trade all"
msgstr "Добавить к торговле все"
-#: src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1515
msgid "Store 10"
msgstr "Сохранить 10"
-#: src/gui/popupmenu.cpp:1486
+#: src/gui/popupmenu.cpp:1518
msgid "Store half"
msgstr "Сохранить половину"
-#: src/gui/popupmenu.cpp:1488
+#: src/gui/popupmenu.cpp:1520
msgid "Store all"
msgstr "Сохранить все"
-#: src/gui/popupmenu.cpp:1522
+#: src/gui/popupmenu.cpp:1554
msgid "Retrieve 10"
msgstr "Получить 10"
-#: src/gui/popupmenu.cpp:1525
+#: src/gui/popupmenu.cpp:1557
msgid "Retrieve half"
msgstr "Получить половину"
-#: src/gui/popupmenu.cpp:1527
+#: src/gui/popupmenu.cpp:1559
msgid "Retrieve all"
msgstr "Получить все"
-#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
msgid "Load old item shortcuts"
msgstr "Загрузить старые горячие клавиши предметов"
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1672
msgid "Load old drop shortcuts"
msgstr "Загрузить старые данные"
-#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
+#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
msgid "Hide"
msgstr "Спрятать"
-#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
msgid "Show"
msgstr "Показать"
-#: src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1744
msgid "Reset yellow bar"
msgstr "сбросить настройки"
-#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
#: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
msgid "(default)"
msgstr "(поумолчанию)"
-#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
msgid "Move up"
msgstr "Передвинуть выше"
-#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
msgid "Move down"
msgstr "Передвинуть ниже"
@@ -1573,60 +1594,60 @@ msgstr "Пароль не должен содержать более %d симв
msgid "Passwords do not match."
msgstr "Пароли не совпадают."
-#: src/gui/serverdialog.cpp:216
+#: src/gui/serverdialog.cpp:226
msgid "Choose Your Server"
msgstr "Выберите сервер"
-#: src/gui/serverdialog.cpp:232
+#: src/gui/serverdialog.cpp:242
msgid "Port:"
msgstr "Порт:"
-#: src/gui/serverdialog.cpp:235
+#: src/gui/serverdialog.cpp:245
msgid "Use same ip for game sub servers"
msgstr "Использовать одинаковый IP для игровых суб-серверов"
-#: src/gui/serverdialog.cpp:250
+#: src/gui/serverdialog.cpp:259
msgid "Server type:"
msgstr "Тип:"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:283
msgid "Load"
msgstr "Загрузить"
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:284
msgid "Connect"
msgstr "Соединиться"
-#: src/gui/serverdialog.cpp:267
+#: src/gui/serverdialog.cpp:285
msgid "Custom Server"
msgstr "Добавить"
-#: src/gui/serverdialog.cpp:374
+#: src/gui/serverdialog.cpp:390
msgid "Please type both the address and the port of a server."
msgstr "Следует указать адрес и порт сервера."
-#: src/gui/serverdialog.cpp:521
+#: src/gui/serverdialog.cpp:548
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Получение списка серверов...%2.2f%%"
-#: src/gui/serverdialog.cpp:526
+#: src/gui/serverdialog.cpp:553
msgid "Waiting for server..."
msgstr "Ожидание ответа от сервера"
-#: src/gui/serverdialog.cpp:530
+#: src/gui/serverdialog.cpp:557
msgid "Preparing download"
msgstr "Подготовка к загрузке"
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:561
msgid "Error retreiving server list!"
msgstr "Не удалось получить список серверов!"
-#: src/gui/serverdialog.cpp:632
+#: src/gui/serverdialog.cpp:659
msgid "requires a newer version"
msgstr "требуется более новая версия"
-#: src/gui/serverdialog.cpp:634
+#: src/gui/serverdialog.cpp:661
#, c-format
msgid "requires v%s"
msgstr "требуется v%s"
@@ -2230,8 +2251,8 @@ msgstr "Нет"
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
-"Не удалось переключиться в оконный режим. Восстановить старый режим также не"
-" удалось!"
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
+"удалось!"
#: src/gui/setup_video.cpp:539
msgid ""
@@ -2294,7 +2315,8 @@ msgstr "Купить"
msgid "Sell items"
msgstr "Продать"
-#: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120 src/gui/trade.cpp:86
+#: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
+#: src/gui/tradewindow.cpp:86
msgid "Add"
msgstr "Добавить"
@@ -3042,47 +3064,46 @@ msgstr "Уровень школы:"
msgid "Save"
msgstr "Сохранить"
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:55
msgid "Propose trade"
msgstr "Предложить торговлю"
-#: src/gui/trade.cpp:56
+#: src/gui/tradewindow.cpp:56
msgid "Confirmed. Waiting..."
msgstr "Подтверждено. Ждем-с..."
-#: src/gui/trade.cpp:57
+#: src/gui/tradewindow.cpp:57
msgid "Agree trade"
msgstr "Подтвердить торговлю"
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:58
msgid "Agreed. Waiting..."
msgstr "Подтверждено. Ждем-с..."
-#: src/gui/trade.cpp:61
+#: src/gui/tradewindow.cpp:61
msgid "Trade: You"
msgstr "Торговля: Вы"
-#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
+#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
#, c-format
msgid "You get %s"
msgstr "Вы получаете %s."
-#: src/gui/trade.cpp:109
+#: src/gui/tradewindow.cpp:109
msgid "You give:"
msgstr "Вы отдаете:"
-#: src/gui/trade.cpp:113
+#: src/gui/tradewindow.cpp:113
msgid "Change"
msgstr "Сменить"
-#: src/gui/trade.cpp:314
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:314
+msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
"Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
"объектов более одного раза."
-#: src/gui/trade.cpp:359
+#: src/gui/tradewindow.cpp:359
msgid "You don't have enough money."
msgstr "У вас недостаточно денег"
@@ -3420,16 +3441,15 @@ msgstr "Команда: /ignore"
#: src/gui/widgets/whispertab.cpp:123
msgid "This command ignores the other player regardless of current relations."
msgstr ""
-"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих"
-" отношений с ним."
+"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих "
+"отношений с ним."
#: src/gui/widgets/whispertab.cpp:128
msgid "Command: /unignore <player>"
msgstr "Команда: /unignore <игрок>"
#: src/gui/widgets/whispertab.cpp:129
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
msgstr "Эта команда прекращает игнорирование другого игрока."
#: src/gui/windowmenu.cpp:62
@@ -3907,37 +3927,37 @@ msgstr ""
msgid "You were killed by "
msgstr "Вы были убиты "
-#: src/localplayer.cpp:1364
+#: src/localplayer.cpp:1379
msgid "Tried to pick up nonexistent item."
msgstr "Попытка поднять несуществующий предмет."
-#: src/localplayer.cpp:1366
+#: src/localplayer.cpp:1381
msgid "Item is too heavy."
msgstr "Предмет слишком тяжелый"
-#: src/localplayer.cpp:1368
+#: src/localplayer.cpp:1383
msgid "Item is too far away"
msgstr "Предмет слишком далеко"
-#: src/localplayer.cpp:1370
+#: src/localplayer.cpp:1385
msgid "Inventory is full."
msgstr "Инвентарь переполнен."
-#: src/localplayer.cpp:1372
+#: src/localplayer.cpp:1387
msgid "Stack is too big."
msgstr "Слишком много предметов."
-#: src/localplayer.cpp:1375
+#: src/localplayer.cpp:1390
msgid "Item belongs to someone else."
msgstr "Предмет принадлежит кому-то еще."
-#: src/localplayer.cpp:1378
+#: src/localplayer.cpp:1393
msgid "Unknown problem picking up item."
msgstr "Неизвестная проблема при поднятии предмета."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1417
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -3945,27 +3965,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
msgstr[1] "Вы подняли %d [@@%d|%s@@]."
msgstr[2] "Вы подняли %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3131
+#: src/localplayer.cpp:3146
msgid "Away"
msgstr "Отошел"
-#: src/localplayer.cpp:3435
+#: src/localplayer.cpp:3450
msgid "Follow: "
msgstr "Следование: "
-#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
+#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
msgid "Follow canceled"
msgstr "Следование отменено"
-#: src/localplayer.cpp:3444
+#: src/localplayer.cpp:3459
msgid "Imitation: "
msgstr "Имитация: "
-#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
msgid "Imitation canceled"
msgstr "Имитация отменена"
-#: src/localplayer.cpp:3806
+#: src/localplayer.cpp:3821
msgid "You see "
msgstr "Вы видите "
@@ -4062,6 +4082,18 @@ msgstr " --safemode : Запуск игры в безопасном р
msgid " --no-opengl : Disable OpenGL for this session"
msgstr " --no-opengl : Не использовать OpenGL для этой сессии"
+#: src/net/ea/buysellhandler.cpp:161
+msgid "Nothing to sell."
+msgstr "Нечего продавать..."
+
+#: src/net/ea/buysellhandler.cpp:169
+msgid "Thanks for buying."
+msgstr "Спасибо за покупку!"
+
+#: src/net/ea/buysellhandler.cpp:177
+msgid "Unable to buy."
+msgstr "Низзя купить!"
+
#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:248
msgid "Strength"
msgstr "Сила (str)"
@@ -4441,39 +4473,27 @@ msgstr "Торговля отменена."
msgid "Trade completed."
msgstr "Торговля завершена."
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:68
msgid "Kick failed!"
msgstr "Не удалось вышвырнуть!"
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:70
msgid "Kick succeeded!"
msgstr "Игрок вышвырнут!"
-#: src/net/tmwa/buysellhandler.cpp:132
-msgid "Nothing to sell."
-msgstr "Нечего продавать..."
-
-#: src/net/tmwa/buysellhandler.cpp:139
-msgid "Thanks for buying."
-msgstr "Спасибо за покупку!"
-
-#: src/net/tmwa/buysellhandler.cpp:147
-msgid "Unable to buy."
-msgstr "Низзя купить!"
-
-#: src/net/tmwa/buysellhandler.cpp:155
+#: src/net/tmwa/buysellhandler.cpp:129
msgid "Thanks for selling."
msgstr "Спасибо за продажу!"
-#: src/net/tmwa/buysellhandler.cpp:159
+#: src/net/tmwa/buysellhandler.cpp:133
msgid "Unable to sell."
msgstr "Нельзя продать."
-#: src/net/tmwa/buysellhandler.cpp:162
+#: src/net/tmwa/buysellhandler.cpp:136
msgid "Unable to sell while trading."
msgstr "Невозможно продавать в режиме обмена."
-#: src/net/tmwa/buysellhandler.cpp:165
+#: src/net/tmwa/buysellhandler.cpp:139
msgid "Unable to sell unsellable item."
msgstr "Невозможно продать непродаваемый предмет."
@@ -4492,8 +4512,7 @@ msgstr "Неизвестная ошибка сервера чата."
#: src/net/tmwa/charserverhandler.cpp:172
msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Невозможно создать персонажа. Скорее всего, таке имя уже используется."
+msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
#: src/net/tmwa/charserverhandler.cpp:176 src/net/tmwa/loginhandler.cpp:194
msgid "Wrong name."
@@ -4851,7 +4870,8 @@ msgstr "Команда изменяет политику разделения п
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
-msgstr "<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
+msgstr ""
+"<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
#: src/net/tmwa/gui/partytab.cpp:99
msgid "Command: /item"
@@ -4874,8 +4894,8 @@ msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий"
-" опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
+"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий "
+"опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
#: src/net/tmwa/gui/partytab.cpp:111
msgid "Command: /exp"
@@ -5114,15 +5134,13 @@ msgstr "Сообщение"
#: src/net/tmwa/playerhandler.cpp:341
msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
msgstr ""
"Вы несете груз больший, чем половина вашей грузоподъемности. Не удалось "
"восстановить здоровье."
#: src/net/tmwa/playerhandler.cpp:351
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You are can regain health."
msgstr ""
"Вы несете груз меньше, чем половина вашей грузоподъемности. Вы можете "
"восстановить здоровье."
@@ -5284,7 +5302,7 @@ msgid "Floating bubble"
msgstr "Плавающий пузырек"
#: src/resources/beinginfo.cpp:33 src/resources/itemdb.cpp:243
-#: src/resources/monsterdb.cpp:79
+#: src/resources/monsterdb.cpp:82
msgid "unnamed"
msgstr "безымянный"