X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=po%2Fru.po;h=19823e6d62687efe388ed4a736328452d9d06406;hb=779aba0137e0e66768682129a85d29d91dd41dbe;hp=29285240c1672e4ba9c9d21c9da7a229ed6c01f4;hpb=7abe644a52d762ac61e71b88f1b03f51389b7c1d;p=pakfire.git

diff --git a/po/ru.po b/po/ru.po
index 29285240c..19823e6d6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IPFire\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-28 12:35+0200\n"
-"PO-Revision-Date: 2011-10-02 03:21+0000\n"
+"POT-Creation-Date: 2011-10-02 14:37+0200\n"
+"PO-Revision-Date: 2011-10-03 03:20+0000\n"
 "Last-Translator: CompWorm <compworm@ya.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/ipfire/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgstr ""
 
 #: ../python/pakfire/actions.py:223 ../python/pakfire/actions.py:239
 #: ../python/pakfire/actions.py:262 ../python/pakfire/actions.py:285
-#: ../python/pakfire/actions.py:302 ../python/pakfire/actions.py:321
+#: ../python/pakfire/actions.py:302 ../python/pakfire/actions.py:328
 #, python-format
 msgid "Running transaction test for %s"
 msgstr ""
@@ -64,25 +64,25 @@ msgstr "Удаление"
 msgid "Cleanup"
 msgstr "Чистка"
 
-#: ../python/pakfire/actions.py:330
+#: ../python/pakfire/actions.py:337
 msgid "Downgrading"
 msgstr "Производится откат"
 
-#: ../python/pakfire/base.py:199 ../python/pakfire/base.py:229
-#: ../python/pakfire/base.py:275 ../python/pakfire/base.py:316
-#: ../python/pakfire/base.py:349
+#: ../python/pakfire/base.py:203 ../python/pakfire/base.py:233
+#: ../python/pakfire/base.py:279 ../python/pakfire/base.py:320
+#: ../python/pakfire/base.py:353
 msgid "Nothing to do"
 msgstr "Нет заданий"
 
-#: ../python/pakfire/base.py:261
+#: ../python/pakfire/base.py:265
 msgid "There are no packages to install."
 msgstr "Нет пакетов для установки."
 
-#: ../python/pakfire/base.py:454
+#: ../python/pakfire/base.py:458
 msgid "Build command has failed."
 msgstr ""
 
-#: ../python/pakfire/base.py:538
+#: ../python/pakfire/base.py:542
 msgid "Everything is fine."
 msgstr "Все в порядке."
 
@@ -91,22 +91,22 @@ msgid "Package information:"
 msgstr ""
 
 #. Copy the makefile and load source tarballs.
-#: ../python/pakfire/builder.py:284
+#: ../python/pakfire/builder.py:287
 msgid "Extracting"
 msgstr ""
 
-#: ../python/pakfire/builder.py:540
+#: ../python/pakfire/builder.py:543
 msgid "The build command failed. See logfile for details."
 msgstr ""
 
 #. Package the result.
 #. Make all these little package from the build environment.
-#: ../python/pakfire/builder.py:684
+#: ../python/pakfire/builder.py:687
 msgid "Creating packages:"
 msgstr ""
 
 #. Execute the buildscript of this stage.
-#: ../python/pakfire/builder.py:704
+#: ../python/pakfire/builder.py:707
 #, python-format
 msgid "Running stage %s:"
 msgstr ""
@@ -241,7 +241,7 @@ msgstr "Проверить зависимости для конкретного
 msgid "Give name of at least one package to check."
 msgstr "Укажите имя хотя бы одного пакета для проверки."
 
-#: ../python/pakfire/cli.py:299 ../python/pakfire/transaction.py:246
+#: ../python/pakfire/cli.py:299 ../python/pakfire/transaction.py:274
 msgid "Repository"
 msgstr "Репозиторий"
 
@@ -352,11 +352,15 @@ msgid "Do not verify build dependencies."
 msgstr ""
 
 #: ../python/pakfire/compress.py:133
-#: ../python/pakfire/packages/packager.py:489
+#: ../python/pakfire/packages/packager.py:487
 #, python-format
 msgid "Compressing %s"
 msgstr ""
 
+#: ../python/pakfire/downloader.py:126
+msgid "Downloading source files:"
+msgstr ""
+
 #: ../python/pakfire/errors.py:30
 msgid "An unhandled error occured."
 msgstr "Возникла неизвестная ошибка."
@@ -377,117 +381,122 @@ msgstr ""
 msgid "Running pakfire-build in a pakfire container?"
 msgstr ""
 
-#: ../python/pakfire/errors.py:82 ../python/pakfire/transaction.py:308
+#: ../python/pakfire/errors.py:82 ../python/pakfire/transaction.py:338
 msgid "Transaction test was not successful"
 msgstr ""
 
-#: ../python/pakfire/packages/base.py:89
+#: ../python/pakfire/i18n.py:54
+#, python-format
+msgid "%(commas)s and %(last)s"
+msgstr ""
+
+#: ../python/pakfire/packages/base.py:94
 msgid "Name"
 msgstr "Имя"
 
-#: ../python/pakfire/packages/base.py:90 ../python/pakfire/transaction.py:245
+#: ../python/pakfire/packages/base.py:95 ../python/pakfire/transaction.py:273
 msgid "Arch"
 msgstr "Архитектура"
 
-#: ../python/pakfire/packages/base.py:91 ../python/pakfire/transaction.py:245
+#: ../python/pakfire/packages/base.py:96 ../python/pakfire/transaction.py:273
 msgid "Version"
 msgstr "Версия"
 
-#: ../python/pakfire/packages/base.py:92
+#: ../python/pakfire/packages/base.py:97
 msgid "Release"
 msgstr "Релиз"
 
-#: ../python/pakfire/packages/base.py:96 ../python/pakfire/transaction.py:246
+#: ../python/pakfire/packages/base.py:101 ../python/pakfire/transaction.py:274
 msgid "Size"
 msgstr "Размер"
 
-#: ../python/pakfire/packages/base.py:100
+#: ../python/pakfire/packages/base.py:105
 msgid "Repo"
 msgstr "Репозиторий"
 
-#: ../python/pakfire/packages/base.py:103
+#: ../python/pakfire/packages/base.py:108
 msgid "Summary"
 msgstr "Резюме"
 
-#: ../python/pakfire/packages/base.py:104
+#: ../python/pakfire/packages/base.py:109
 msgid "Groups"
 msgstr "Группы"
 
-#: ../python/pakfire/packages/base.py:105
+#: ../python/pakfire/packages/base.py:110
 msgid "URL"
 msgstr "URL"
 
-#: ../python/pakfire/packages/base.py:106
+#: ../python/pakfire/packages/base.py:111
 msgid "License"
 msgstr "Лицензия"
 
-#: ../python/pakfire/packages/base.py:109
+#: ../python/pakfire/packages/base.py:114
 msgid "Description"
 msgstr "Описание"
 
-#: ../python/pakfire/packages/base.py:116
+#: ../python/pakfire/packages/base.py:121
 msgid "Maintainer"
 msgstr ""
 
-#: ../python/pakfire/packages/base.py:118
+#: ../python/pakfire/packages/base.py:123
 msgid "UUID"
 msgstr "UUID"
 
-#: ../python/pakfire/packages/base.py:119
+#: ../python/pakfire/packages/base.py:124
 msgid "Build ID"
 msgstr "ID сборки"
 
-#: ../python/pakfire/packages/base.py:120
+#: ../python/pakfire/packages/base.py:125
 msgid "Build date"
 msgstr "Дата сборки"
 
-#: ../python/pakfire/packages/base.py:121
+#: ../python/pakfire/packages/base.py:126
 msgid "Build host"
 msgstr "Хост сборки"
 
-#: ../python/pakfire/packages/base.py:123
+#: ../python/pakfire/packages/base.py:128
 msgid "Provides"
 msgstr "Обеспечивает"
 
-#: ../python/pakfire/packages/base.py:128
+#: ../python/pakfire/packages/base.py:133
 msgid "Pre-requires"
 msgstr ""
 
-#: ../python/pakfire/packages/base.py:133
+#: ../python/pakfire/packages/base.py:138
 msgid "Requires"
 msgstr "Требует"
 
-#: ../python/pakfire/packages/base.py:138
+#: ../python/pakfire/packages/base.py:143
 msgid "Conflicts"
 msgstr ""
 
-#: ../python/pakfire/packages/base.py:143
+#: ../python/pakfire/packages/base.py:148
 msgid "Obsoletes"
 msgstr ""
 
-#: ../python/pakfire/packages/base.py:151
+#: ../python/pakfire/packages/base.py:156
 msgid "File"
 msgstr "Файл"
 
-#: ../python/pakfire/packages/base.py:332
+#: ../python/pakfire/packages/base.py:337
 msgid "Not set"
 msgstr "Не установлено"
 
-#: ../python/pakfire/packages/file.py:106
+#: ../python/pakfire/packages/file.py:107
 #, python-format
 msgid "Could not extract file: /%(src)s - %(dst)s"
 msgstr ""
 
-#: ../python/pakfire/packages/file.py:156
+#: ../python/pakfire/packages/file.py:160
 #, python-format
 msgid "Filename: %s"
 msgstr ""
 
-#: ../python/pakfire/packages/make.py:100
+#: ../python/pakfire/packages/make.py:70
 msgid "Package name is undefined."
 msgstr ""
 
-#: ../python/pakfire/packages/make.py:103
+#: ../python/pakfire/packages/make.py:73
 msgid "Package version is undefined."
 msgstr ""
 
@@ -496,7 +505,7 @@ msgstr ""
 msgid "Packaging"
 msgstr ""
 
-#: ../python/pakfire/packages/packager.py:608
+#: ../python/pakfire/packages/packager.py:606
 #, python-format
 msgid "Building source package %s:"
 msgstr ""
@@ -561,70 +570,80 @@ msgstr "    Решение: %s"
 msgid "    Solutions:"
 msgstr "    Решения:"
 
-#: ../python/pakfire/transaction.py:180
+#: ../python/pakfire/transaction.py:76
+#, python-format
+msgid "file %s from %s conflicts with file from package %s"
+msgstr ""
+
+#: ../python/pakfire/transaction.py:82
+#, python-format
+msgid "file %s from %s conflicts with files from %s"
+msgstr ""
+
+#: ../python/pakfire/transaction.py:208
 msgid "Downloading packages:"
 msgstr "Скачивание пакетов:"
 
-#: ../python/pakfire/transaction.py:245
+#: ../python/pakfire/transaction.py:273
 msgid "Package"
 msgstr "Пакет"
 
-#: ../python/pakfire/transaction.py:250
+#: ../python/pakfire/transaction.py:278
 msgid "Installing:"
 msgstr "Устанавливается"
 
-#: ../python/pakfire/transaction.py:251
+#: ../python/pakfire/transaction.py:279
 msgid "Reinstalling:"
 msgstr "Переустановка:"
 
-#: ../python/pakfire/transaction.py:252
+#: ../python/pakfire/transaction.py:280
 msgid "Updating:"
 msgstr "Обновляется"
 
-#: ../python/pakfire/transaction.py:253
+#: ../python/pakfire/transaction.py:281
 msgid "Downgrading:"
 msgstr "Откат:"
 
-#: ../python/pakfire/transaction.py:254
+#: ../python/pakfire/transaction.py:282
 msgid "Removing:"
 msgstr "Удаляется"
 
-#: ../python/pakfire/transaction.py:260
+#: ../python/pakfire/transaction.py:288
 msgid "Transaction Summary"
 msgstr "Информация о транзакции"
 
-#: ../python/pakfire/transaction.py:267
+#: ../python/pakfire/transaction.py:295
 msgid "package"
 msgstr "пакет"
 
-#: ../python/pakfire/transaction.py:273
+#: ../python/pakfire/transaction.py:301
 #, python-format
 msgid "Total download size: %s"
 msgstr "Суммарный объём загрузки: %s"
 
-#: ../python/pakfire/transaction.py:277
+#: ../python/pakfire/transaction.py:305
 #, python-format
 msgid "Installed size: %s"
 msgstr "Размер после установки: %s"
 
-#: ../python/pakfire/transaction.py:279
+#: ../python/pakfire/transaction.py:307
 #, python-format
 msgid "Freed size: %s"
 msgstr "Освобождено: %s."
 
-#: ../python/pakfire/transaction.py:288
+#: ../python/pakfire/transaction.py:316
 msgid "Is this okay?"
 msgstr "Всё верно?"
 
-#: ../python/pakfire/transaction.py:291
+#: ../python/pakfire/transaction.py:319
 msgid "Running Transaction Test"
 msgstr ""
 
-#: ../python/pakfire/transaction.py:303
+#: ../python/pakfire/transaction.py:331
 msgid "Transaction Test Succeeded"
 msgstr ""
 
-#: ../python/pakfire/transaction.py:317
+#: ../python/pakfire/transaction.py:347
 msgid "Running transaction"
 msgstr "Запуск транзакции"