summaryrefslogtreecommitdiff
path: root/po/ru.po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-04-26 20:30:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-04-26 20:30:22 +0300
commit6b06a89665fdfa9ecc7179bae827cefae3cb1a77 (patch)
treed90008a75b6d3d883591ccce196b43c94c3cd67c /po/ru.po
parentbcdf34645ff3067d3b4110120b6191af2b0b2e99 (diff)
parent2ee2f8b060e4fe88feeeba5508189c916e55a70d (diff)
downloadmv-6b06a89665fdfa9ecc7179bae827cefae3cb1a77.tar.gz
mv-6b06a89665fdfa9ecc7179bae827cefae3cb1a77.tar.bz2
mv-6b06a89665fdfa9ecc7179bae827cefae3cb1a77.tar.xz
mv-6b06a89665fdfa9ecc7179bae827cefae3cb1a77.zip
Merge branch 'master' into stablestable
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po28
1 files changed, 14 insertions, 14 deletions
diff --git a/po/ru.po b/po/ru.po
index 3395e3dd7..4f45eeb67 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-04-13 03:00+0300\n"
+"POT-Creation-Date: 2014-04-26 12:00+0300\n"
"PO-Revision-Date: 2014-04-04 14:48+0000\n"
"Last-Translator: Alexsl <alexlsh@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
@@ -907,25 +907,25 @@ msgstr "%d секунд"
msgid "Environment variables dumped"
msgstr "Переменные среды сохранены"
-#: src/commands.cpp:1348
+#: src/commands.cpp:1349
msgid "Uploaded config into:"
msgstr "Информация о выгруженном конфиге:"
-#: src/commands.cpp:1356
+#: src/commands.cpp:1357
msgid "Uploaded server config into:"
msgstr "Информация о выгруженном конфиге сервера:"
-#: src/commands.cpp:1364
+#: src/commands.cpp:1365
msgid "Uploaded log into:"
msgstr "Информация о выгруженном логе:"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1485 src/commands.cpp:1494
+#: src/commands.cpp:1486 src/commands.cpp:1495
msgid "Resource images:"
msgstr "Изображений:"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1488 src/commands.cpp:1497
+#: src/commands.cpp:1489 src/commands.cpp:1498
msgid "Resource orphaned images:"
msgstr "Удаленных изображений:"
@@ -1677,7 +1677,7 @@ msgstr "Добавить к торговле все"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1954 src/gui/popups/popupmenu.cpp:2084
#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/inventorywindow.cpp:222
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Сохранить"
@@ -1742,7 +1742,7 @@ msgstr "Получить все"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:2046 src/gui/popups/popupmenu.cpp:2824
#: src/gui/windows/inventorywindow.cpp:173
-#: src/gui/windows/inventorywindow.cpp:654 src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:289
msgid "Use"
msgstr "Использовать"
@@ -1934,7 +1934,7 @@ msgstr "Поставить защиту"
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2809 src/gui/windows/equipmentwindow.cpp:67
#: src/gui/windows/inventorywindow.cpp:175
-#: src/gui/windows/inventorywindow.cpp:643
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "Снять"
@@ -1943,7 +1943,7 @@ msgstr "Снять"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2815 src/gui/windows/inventorywindow.cpp:171
-#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Надеть"
@@ -1951,7 +1951,7 @@ msgstr "Надеть"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:188
-#: src/gui/windows/inventorywindow.cpp:752
+#: src/gui/windows/inventorywindow.cpp:756
msgid "Drop..."
msgstr "Бросить..."
@@ -1966,7 +1966,7 @@ msgstr "Бросить все"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:126
-#: src/gui/windows/inventorywindow.cpp:757
+#: src/gui/windows/inventorywindow.cpp:761
msgid "Drop"
msgstr "Бросить"
@@ -3015,7 +3015,7 @@ msgstr "Уровень: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:567
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:150 src/gui/windows/statuswindow.cpp:313
#: src/gui/windows/statuswindow.cpp:366
#, c-format
@@ -6684,7 +6684,7 @@ msgid "##1 you try again later."
msgstr "##1 попытаться еще раз немного погодя."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:948
+#: src/gui/windows/updaterwindow.cpp:938
msgid "Completed"
msgstr "Завершено"