summaryrefslogtreecommitdiff
path: root/po/ru.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po313
1 files changed, 157 insertions, 156 deletions
diff --git a/po/ru.po b/po/ru.po
index 39a2d3adc..253f4a021 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-11-30 17:59+0300\n"
-"PO-Revision-Date: 2013-11-25 00:21+0000\n"
-"Last-Translator: Alexsl <alexlsh@mail.ru>\n"
+"POT-Creation-Date: 2013-12-20 14:43+0300\n"
+"PO-Revision-Date: 2013-12-01 09:52+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
"language/ru/)\n"
"Language: ru\n"
@@ -47,21 +47,21 @@ msgstr "Видимые на карте"
msgid "Human"
msgstr "Человек"
-#: src/being/being.cpp:514
+#: src/being/being.cpp:520
msgid "dodge"
msgstr "уклонение"
-#: src/being/being.cpp:514
+#: src/being/being.cpp:520
msgid "miss"
msgstr "промах"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1758 src/gui/windows/whoisonline.cpp:862
+#: src/being/being.cpp:1759 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "О"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1763 src/gui/windows/whoisonline.cpp:867
+#: src/being/being.cpp:1764 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "Б"
@@ -128,376 +128,376 @@ msgid "job"
msgstr "работа"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1866
+#: src/being/localplayer.cpp:1867
msgid "(D) default moves"
msgstr "(D) движения по умолчанию"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1868
+#: src/being/localplayer.cpp:1869
msgid "(I) invert moves"
msgstr "(I) обратное движение"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1870
+#: src/being/localplayer.cpp:1871
msgid "(c) moves with some crazy moves"
msgstr "(c) обычное движение иногда с сумасшедшими движениями"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1872
+#: src/being/localplayer.cpp:1873
msgid "(C) moves with crazy moves"
msgstr "(C) движение с сумасшедшими движениями"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1874
+#: src/being/localplayer.cpp:1875
msgid "(d) double normal + crazy"
msgstr "(d) нормальные и сумасшедшие движения"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1876
+#: src/being/localplayer.cpp:1877
msgid "(?) unknown move"
msgstr "(?) неизвестное движение"
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1899
+#: src/being/localplayer.cpp:1900
#, c-format
msgid "(%u) crazy move number %u"
msgstr "(%u) сумасшедшее движение %u"
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1905
+#: src/being/localplayer.cpp:1906
msgid "(a) custom crazy move"
msgstr "(a) пользовательские сумасшедшие движения"
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1911
msgid "(?) crazy move"
msgstr "(?) неизвестные сумасшедшие движения"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1925
+#: src/being/localplayer.cpp:1926
msgid "(0) default moves to target"
msgstr "(0) обычное движение к цели"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1927
+#: src/being/localplayer.cpp:1928
msgid "(1) moves to target in distance 1"
msgstr "(1) движение к цели на расстояние 1"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1929
+#: src/being/localplayer.cpp:1930
msgid "(2) moves to target in distance 2"
msgstr "(2) движение к цели на расстояние 2"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1931
+#: src/being/localplayer.cpp:1932
msgid "(3) moves to target in distance 3"
msgstr "(3) движение к цели на расстояние 3"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1933
+#: src/being/localplayer.cpp:1934
msgid "(5) moves to target in distance 5"
msgstr "(5) движение к цели на расстояние 5"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1935
+#: src/being/localplayer.cpp:1936
msgid "(7) moves to target in distance 7"
msgstr "(7) движение к цели на расстояние 7"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1937
+#: src/being/localplayer.cpp:1938
msgid "(A) moves to target in attack range"
msgstr "(A) движение к цели на расстояние атаки"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1939
+#: src/being/localplayer.cpp:1940
msgid "(a) archer attack range"
msgstr "(a) атака лучника"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1941
+#: src/being/localplayer.cpp:1942
msgid "(B) moves to target in attack range - 1"
msgstr "(B) движение к цели на расстояние атаки - 1"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1943
+#: src/being/localplayer.cpp:1944
msgid "(?) move to target"
msgstr "(?) неизвестное движение к цели"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1963
+#: src/being/localplayer.cpp:1964
msgid "(D) default follow"
msgstr "(D) следование по умолчанию"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1965
+#: src/being/localplayer.cpp:1966
msgid "(R) relative follow"
msgstr "(R) относительное следование"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1967
+#: src/being/localplayer.cpp:1968
msgid "(M) mirror follow"
msgstr "(M) зеркальное следование"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1969
+#: src/being/localplayer.cpp:1970
msgid "(P) pet follow"
msgstr "(P) следование как животное"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1971
+#: src/being/localplayer.cpp:1972
msgid "(?) unknown follow"
msgstr "(?) неизвестное следование"
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1991 src/being/localplayer.cpp:1999
-#: src/being/localplayer.cpp:2027
+#: src/being/localplayer.cpp:1992 src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:2028
msgid "(?) attack"
msgstr "(?) неизвестная атака"
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1993 src/being/localplayer.cpp:2019
+#: src/being/localplayer.cpp:1994 src/being/localplayer.cpp:2020
msgid "(D) default attack"
msgstr "(D) обычная атака"
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1995
+#: src/being/localplayer.cpp:1996
msgid "(s) switch attack without shield"
msgstr "(s) переключение атаки без щита"
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:1997
+#: src/being/localplayer.cpp:1998
msgid "(S) switch attack with shield"
msgstr "(S) переключение атаки со щитом"
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2021
+#: src/being/localplayer.cpp:2022
msgid "(G) go and attack"
msgstr "(G) идти и атаковать"
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2023
+#: src/being/localplayer.cpp:2024
msgid "(A) go, attack, pickup"
msgstr "(A) идти, атаковать, собирать"
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2025
+#: src/being/localplayer.cpp:2026
msgid "(d) without auto attack"
msgstr "(d) без автоатаки"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2079
+#: src/being/localplayer.cpp:2080
msgid "(S) small pick up 1x1 cells"
msgstr "(S) поднятие в области 1x1"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2081
+#: src/being/localplayer.cpp:2082
msgid "(D) default pick up 2x1 cells"
msgstr "(D) поднятие из области 2x1"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2083
+#: src/being/localplayer.cpp:2084
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) поднятие из области спереди 2x3"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2085
+#: src/being/localplayer.cpp:2086
msgid "(3) pick up 3x3 cells"
msgstr "(3) поднятие из области 3x3"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2087
+#: src/being/localplayer.cpp:2088
msgid "(g) go and pick up in distance 4"
msgstr "(g) движение и поднятие на расстоянии 4"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2089
+#: src/being/localplayer.cpp:2090
msgid "(G) go and pick up in distance 8"
msgstr "(g) движение и поднятие на расстоянии 8"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2091
+#: src/being/localplayer.cpp:2092
msgid "(A) go and pick up in max distance"
msgstr "(A) движение и поднятие на максимальном расстоянии"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2093
+#: src/being/localplayer.cpp:2094
msgid "(?) pick up"
msgstr "(?) неизвестный режим поднятия"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2107
+#: src/being/localplayer.cpp:2108
msgid "(N) normal map view"
msgstr "(N) обычный режим карты"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2109
+#: src/being/localplayer.cpp:2110
msgid "(D) debug map view"
msgstr "(D) отладочный режим карты"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2111
+#: src/being/localplayer.cpp:2112
msgid "(u) ultra map view"
msgstr "(u) специальный режим карты"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2113
+#: src/being/localplayer.cpp:2114
msgid "(U) ultra map view 2"
msgstr "(U) специальный режим карты 2"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2115
+#: src/being/localplayer.cpp:2116
msgid "(e) empty map view"
msgstr "(e) режим пустой карты"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2117
+#: src/being/localplayer.cpp:2118
msgid "(b) black & white map view"
msgstr "(b) черно-белый режим карты"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2137
+#: src/being/localplayer.cpp:2138
msgid "(f) use #flar for magic attack"
msgstr "(f) использовать #flar для атаки"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2139
+#: src/being/localplayer.cpp:2140
msgid "(c) use #chiza for magic attack"
msgstr "(c) использовать #chiza для атаки"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2141
+#: src/being/localplayer.cpp:2142
msgid "(I) use #ingrav for magic attack"
msgstr "(I) использовать #ingrav для атаки"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2143
+#: src/being/localplayer.cpp:2144
msgid "(F) use #frillyar for magic attack"
msgstr "(F) использовать #frillyar для атаки"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2145
+#: src/being/localplayer.cpp:2146
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) использовать #upmarmu для атаки"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2147
+#: src/being/localplayer.cpp:2148
msgid "(?) magic attack"
msgstr "(?) неизвестная магическая атака"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2167
+#: src/being/localplayer.cpp:2168
msgid "(a) attack all players"
msgstr "(a) атаковать всех игроков"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2169
+#: src/being/localplayer.cpp:2170
msgid "(f) attack all except friends"
msgstr "(f) атаковать всех кроме друзей"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2171
+#: src/being/localplayer.cpp:2172
msgid "(b) attack bad relations"
msgstr "(b) атаковать врагов"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2173
+#: src/being/localplayer.cpp:2174
msgid "(d) don't attack players"
msgstr "(d) не атаковать игроков"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2175
+#: src/being/localplayer.cpp:2176
msgid "(?) pvp attack"
msgstr "(?) pvp атака"
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2195
+#: src/being/localplayer.cpp:2196
msgid "(D) default imitation"
msgstr "(D) имитация по умолчанию"
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2197
+#: src/being/localplayer.cpp:2198
msgid "(O) outfits imitation"
msgstr "(O) имитация нарядов"
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2199
+#: src/being/localplayer.cpp:2200
msgid "(?) imitation"
msgstr "(?) неизвестная имитация"
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2228
+#: src/being/localplayer.cpp:2229
msgid "Away"
msgstr "Отошел"
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2251
+#: src/being/localplayer.cpp:2252
msgid "(O) on keyboard"
msgstr "(O) возле компьютера"
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2253
+#: src/being/localplayer.cpp:2254
msgid "(A) away"
msgstr "(A) отошел"
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2255 src/being/localplayer.cpp:2273
+#: src/being/localplayer.cpp:2256 src/being/localplayer.cpp:2274
msgid "(?) away"
msgstr "(?) неизвестный режим отошел"
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2269
+#: src/being/localplayer.cpp:2270
msgid "(G) game camera mode"
msgstr "(G) игровая камера"
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2271
+#: src/being/localplayer.cpp:2272
msgid "(F) free camera mode"
msgstr "(F) свободная камера"
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2298
+#: src/being/localplayer.cpp:2299
msgid "Game modifiers are enabled"
msgstr "Игровые модификаторы включены"
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2300
+#: src/being/localplayer.cpp:2301
msgid "Game modifiers are disabled"
msgstr "Игровые модификаторы выключены"
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2302
+#: src/being/localplayer.cpp:2303
msgid "Game modifiers are unknown"
msgstr "Игровые модификаторы в неизвестном положении"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3861
+#: src/being/localplayer.cpp:3862
#, c-format
msgid "Follow: %s"
msgstr "Следовать за: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3867 src/being/localplayer.cpp:3892
+#: src/being/localplayer.cpp:3868 src/being/localplayer.cpp:3893
msgid "Follow canceled"
msgstr "Следование отменено"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3877
+#: src/being/localplayer.cpp:3878
#, c-format
msgid "Imitation: %s"
msgstr "Имитация: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3883 src/being/localplayer.cpp:3897
+#: src/being/localplayer.cpp:3884 src/being/localplayer.cpp:3898
msgid "Imitation canceled"
msgstr "Имитация отменена"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4240
+#: src/being/localplayer.cpp:4241
#, c-format
msgid "You see %s"
msgstr "Вы видите %s"
@@ -574,7 +574,7 @@ msgstr "Помощь"
#. TRANSLATORS: shop window button
#: src/client.cpp:1134 src/gui/popups/popupmenu.cpp:618
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
+#: src/gui/windows/inventorywindow.cpp:256 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
#: src/gui/windows/shopwindow.cpp:77
msgid "Close"
@@ -692,7 +692,7 @@ msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
#. TRANSLATORS: error message question
-#: src/client.cpp:2919
+#: src/client.cpp:2927
msgid "Do you want to open support page?"
msgstr "Открыть страницу поддержки?"
@@ -1196,7 +1196,7 @@ msgstr "Добавить имя в чат"
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
#: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
#: src/gui/windows/socialwindow.cpp:1231
-#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:179
msgid "Cancel"
@@ -1268,7 +1268,7 @@ msgstr "Передвинуть камеру"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr "Наряды"
@@ -1418,8 +1418,8 @@ msgstr "Добавить к торговле все"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:248
-#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/setup.cpp:92
+#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:252
+#: src/gui/windows/inventorywindow.cpp:778 src/gui/windows/setup.cpp:92
msgid "Store"
msgstr "Сохранить"
@@ -1450,7 +1450,7 @@ msgstr "Сохранить все"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:250
+#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:254
msgid "Retrieve"
msgstr "Получить"
@@ -1483,8 +1483,8 @@ msgstr "Получить все"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:689 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Использовать"
@@ -1511,7 +1511,7 @@ msgstr "сбросить настройки"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:167
+#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr "Скопировать в чат"
@@ -1586,7 +1586,7 @@ msgstr "Пренебречь"
#. TRANSLATORS: confirm dialog button
#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
-#: src/gui/windows/confirmdialog.cpp:58
+#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr "Игнорировать"
@@ -1676,8 +1676,8 @@ msgstr "Поставить защиту"
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
-#: src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:674
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:678
msgid "Unequip"
msgstr "Снять"
@@ -1685,16 +1685,16 @@ msgstr "Снять"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:200
-#: src/gui/windows/inventorywindow.cpp:679 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:683 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Надеть"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:782
+#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:786
msgid "Drop..."
msgstr "Бросить..."
@@ -1709,14 +1709,14 @@ msgstr "Бросить все"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:787
+#: src/gui/windows/inventorywindow.cpp:791
msgid "Drop"
msgstr "Бросить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:221
msgid "Split"
msgstr "Разделить"
@@ -2719,9 +2719,8 @@ msgstr "Точка дороги"
#. TRANSLATORS: palette color
#: src/gui/userpalette.cpp:214
-#, fuzzy
msgid "Tiles border"
-msgstr "Граница домашней позиции"
+msgstr "Бордюр тайлов"
#: src/gui/widgets/characterdisplay.cpp:131
#, c-format
@@ -2730,9 +2729,9 @@ msgstr "Уровень: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:592
-#: src/gui/windows/statuswindow.cpp:148 src/gui/windows/statuswindow.cpp:291
-#: src/gui/windows/statuswindow.cpp:344
+#: src/gui/windows/inventorywindow.cpp:596
+#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:308
+#: src/gui/windows/statuswindow.cpp:361
#, c-format
msgid "Money: %s"
msgstr "Деньги: %s"
@@ -2798,7 +2797,7 @@ msgid "brown"
msgstr "коричневый"
#. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:325
+#: src/gui/widgets/itemcontainer.cpp:323
msgid "Eq."
msgstr "Од."
@@ -2809,7 +2808,7 @@ msgstr "Открыть ссылку"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:301 src/gui/widgets/setupitem.cpp:429
+#: src/gui/widgets/setupitem.cpp:307 src/gui/widgets/setupitem.cpp:443
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Изменить"
@@ -3697,7 +3696,7 @@ msgstr "Включить напоминание о весе"
#. TRANSLATORS: inventory button
#: src/gui/widgets/tabs/setup_other.cpp:251 src/gui/windowmenu.cpp:144
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:225
msgid "Shop"
msgstr "Магазин"
@@ -3852,7 +3851,7 @@ msgstr "Переопределение плотности экрана"
#. TRANSLATORS: texture compression type
#. TRANSLATORS: confirm dialog button
#: src/gui/widgets/tabs/setup_perfomance.cpp:39
-#: src/gui/windows/confirmdialog.cpp:55
+#: src/gui/windows/confirmdialog.cpp:57
msgid "No"
msgstr "Нет"
@@ -4802,7 +4801,7 @@ msgstr "СН"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:227
msgid "Equipment"
msgstr "Снаряжение"
@@ -4813,7 +4812,7 @@ msgstr "ИНВ"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:158
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "Инвентарь"
@@ -4906,7 +4905,7 @@ msgstr "ОПЦ"
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
#: src/gui/windowmenu.cpp:299 src/gui/windows/outfitwindow.cpp:71
-#: src/gui/windows/outfitwindow.cpp:563
+#: src/gui/windows/outfitwindow.cpp:562
#, c-format
msgid "Key: %s"
msgstr "Клавиша: %s"
@@ -4993,7 +4992,7 @@ msgstr "Количество:"
#. TRANSLATORS: status window label (plus sign)
#: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
-#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:801
+#: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:825
msgid "+"
msgstr "+"
@@ -5005,7 +5004,7 @@ msgstr "+"
#. TRANSLATORS: status window label (minus sign)
#: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
-#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:814
+#: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:838
msgid "-"
msgstr "-"
@@ -5024,8 +5023,8 @@ msgstr "Создать"
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
#: src/gui/windows/buydialog.cpp:277 src/gui/windows/selldialog.cpp:111
-#: src/gui/windows/statuswindow.cpp:540 src/gui/windows/statuswindow.cpp:595
-#: src/gui/windows/statuswindow.cpp:798 src/gui/windows/statuswindow.cpp:830
+#: src/gui/windows/statuswindow.cpp:564 src/gui/windows/statuswindow.cpp:619
+#: src/gui/windows/statuswindow.cpp:822 src/gui/windows/statuswindow.cpp:854
msgid "Max"
msgstr "Макс"
@@ -5315,19 +5314,19 @@ msgid "rainbow 3"
msgstr "радуга 3"
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:741
+#: src/gui/windows/chatwindow.cpp:755
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Присутствуют: %s; Всего %d игроков."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1155
+#: src/gui/windows/chatwindow.cpp:1169
#, c-format
msgid "Whispering to %s: %s"
msgstr "Вы прошептали %s: %s"
#. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:53
+#: src/gui/windows/confirmdialog.cpp:55
msgid "Yes"
msgstr "Да"
@@ -5567,9 +5566,9 @@ msgstr "Автоматически открывать это окно"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:46 src/gui/windows/editserverdialog.cpp:76
-#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:50
-#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:46
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:76
+#: src/gui/windows/itemamountwindow.cpp:207 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/quitdialog.cpp:67 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "ОК"
@@ -5843,76 +5842,75 @@ msgstr "Сервер обновлений: %s"
msgid "Open register url"
msgstr "Открыть ссылку регистрации"
-#. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:65
+#: src/gui/windows/ministatuswindow.cpp:66
msgid "health bar"
msgstr "здоровье"
#. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:69
+#: src/gui/windows/ministatuswindow.cpp:72
msgid "mana bar"
msgstr "мана"
#. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:73
+#: src/gui/windows/ministatuswindow.cpp:76
msgid "experience bar"
msgstr "опыт"
#. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:77
+#: src/gui/windows/ministatuswindow.cpp:80
msgid "weight bar"
msgstr "вес"
#. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:80
+#: src/gui/windows/ministatuswindow.cpp:84
msgid "inventory slots bar"
msgstr "слоты интвентаря"
#. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:83
+#: src/gui/windows/ministatuswindow.cpp:87
msgid "money bar"
msgstr "деньги"
#. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:90
msgid "arrows bar"
msgstr "стрелы"
#. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:90
+#: src/gui/windows/ministatuswindow.cpp:94
msgid "status bar"
msgstr "статус"
#. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:113
+#: src/gui/windows/ministatuswindow.cpp:117
msgid "job bar"
msgstr "работа"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:314
-#: src/gui/windows/statuswindow.cpp:302
+#: src/gui/windows/ministatuswindow.cpp:322
+#: src/gui/windows/statuswindow.cpp:319
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Уровень: %d (GM %d)"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:321
-#: src/gui/windows/statuswindow.cpp:146 src/gui/windows/statuswindow.cpp:309
-#: src/gui/windows/statuswindow.cpp:380
+#: src/gui/windows/ministatuswindow.cpp:329
+#: src/gui/windows/statuswindow.cpp:147 src/gui/windows/statuswindow.cpp:326
+#: src/gui/windows/statuswindow.cpp:397
#, c-format
msgid "Level: %d"
msgstr "Уровень: %d"
#. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:337
-#: src/gui/windows/ministatuswindow.cpp:375
+#: src/gui/windows/ministatuswindow.cpp:345
+#: src/gui/windows/ministatuswindow.cpp:383
msgid "Need"
msgstr "Нужно"
#. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:361
+#: src/gui/windows/ministatuswindow.cpp:369
#, c-format
msgid "Job level: %d"
msgstr "Уровень профессии: %d"
@@ -5959,7 +5957,7 @@ msgid "Failed to send as sender or letter invalid."
msgstr "Невозможно послать ибо отправитель либо сообщение неверны."
#. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:557
+#: src/gui/windows/outfitwindow.cpp:62 src/gui/windows/outfitwindow.cpp:556
#, c-format
msgid "Outfit: %d"
msgstr "Наряд: %d"
@@ -6451,39 +6449,39 @@ msgid "Choose your party's name."
msgstr "Выберите имя будущей группы."
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:150
+#: src/gui/windows/statuswindow.cpp:151
msgid "HP:"
msgstr "Жизнь:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:153
+#: src/gui/windows/statuswindow.cpp:154
msgid "Exp:"
msgstr "Опыт:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:209
+#: src/gui/windows/statuswindow.cpp:214
msgid "MP:"
msgstr "Мана:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:240 src/gui/windows/statuswindow.cpp:430
+#: src/gui/windows/statuswindow.cpp:255 src/gui/windows/statuswindow.cpp:447
#, c-format
msgid "Job: %d"
msgstr "Профессия: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:242
+#: src/gui/windows/statuswindow.cpp:257
msgid "Job:"
msgstr "Профессия:"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:295 src/gui/windows/statuswindow.cpp:352
+#: src/gui/windows/statuswindow.cpp:312 src/gui/windows/statuswindow.cpp:369
#, c-format
msgid "Character points: %d"
msgstr "Очки персонажа: %d"
#. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/statuswindow.cpp:384
#, c-format
msgid "Correction points: %d"
msgstr "Очков навыков: %d"
@@ -6667,23 +6665,27 @@ msgstr "Обновление..."
msgid "Connecting..."
msgstr "Соединение..."
+#: src/gui/windows/updaterwindow.cpp:362
+msgid "Show all news (can be slow)"
+msgstr ""
+
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:727
+#: src/gui/windows/updaterwindow.cpp:738
msgid "##1 The update process is incomplete."
msgstr "##1 Процесс обновления не завершен."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:729
+#: src/gui/windows/updaterwindow.cpp:740
msgid "##1 It is strongly recommended that"
msgstr "##1 Настоятельно рекомендуется"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:731
+#: src/gui/windows/updaterwindow.cpp:742
msgid "##1 you try again later."
msgstr "##1 попытаться еще раз немного погодя."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:909
+#: src/gui/windows/updaterwindow.cpp:920
msgid "Completed"
msgstr "Завершено"
@@ -6983,13 +6985,13 @@ msgid "Failed to delete character."
msgstr "Невозможно удалить персонажа."
#. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:97
+#: src/net/ea/chathandler.cpp:98
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr "Сообщение не может быть отправлено, %s оффлайн."
#. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:106
+#: src/net/ea/chathandler.cpp:107
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr "Приватное сообщение не может быть послано: %s игнорирует его."
@@ -7788,9 +7790,8 @@ msgstr "Не удалось увеличить навык!"
#. TRANSLATORS: notification message
#: src/notifications.h:264
-#, fuzzy
msgid "Equip ammunition first."
-msgstr "Для начала экипируйтесь стрелами!"
+msgstr "Для начала экипируйтесь стрелами/патронами"
#. TRANSLATORS: notification message
#: src/notifications.h:267