Author: minton Date: 2015-08-30 20:10:02 +0200 (Sun, 30 Aug 2015) New Revision: 92427 Modified: trunk/yast/ru/po/qt-pkg.ru.po Log: Merged qt-pkg.pot for ru Modified: trunk/yast/ru/po/qt-pkg.ru.po =================================================================== --- trunk/yast/ru/po/qt-pkg.ru.po 2015-08-30 18:10:00 UTC (rev 92426) +++ trunk/yast/ru/po/qt-pkg.ru.po 2015-08-30 18:10:02 UTC (rev 92427) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: qt-pkg.ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-07-13 23:17+0400\n" "Last-Translator: Alexander Melentev <minton@opensuse.org>\n" "Language-Team: Russian <opensuse-translation-ru@opensuse.org>\n" @@ -22,251 +22,259 @@ "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" "X-Generator: Lokalize 1.5\n" -#: src/YQPackageSelector.cc:315 +#: src/YQPackageSelector.cc:318 msgid "&Update Problems" msgstr "Проблемы &обновления" -#: src/YQPackageSelector.cc:342 +#: src/YQPackageSelector.cc:345 msgid "Patter&ns" msgstr "Шабло&ны" -#: src/YQPackageSelector.cc:364 +#: src/YQPackageSelector.cc:367 msgid "Package &Groups" msgstr "&Группы пакетов" -#: src/YQPackageSelector.cc:376 +#: src/YQPackageSelector.cc:379 msgid "&RPM Groups" msgstr "Группы &RPM" -#: src/YQPackageSelector.cc:389 +#: src/YQPackageSelector.cc:392 msgid "&Languages" msgstr "&Языки" -#: src/YQPackageSelector.cc:405 +#: src/YQPackageSelector.cc:408 msgid "&Repositories" msgstr "&Репозитории" -#: src/YQPackageSelector.cc:419 +#: src/YQPackageSelector.cc:422 msgid "S&earch" msgstr "По&иск" #. DEBUG -#: src/YQPackageSelector.cc:426 src/YQPkgSearchFilterView.cc:113 +#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:113 msgid "&Keywords" msgstr "&Ключевые слова" -#: src/YQPackageSelector.cc:435 +#: src/YQPackageSelector.cc:438 msgid "&Installation Summary" msgstr "&Обзор установки" -#: src/YQPackageSelector.cc:520 +#: src/YQPackageSelector.cc:526 msgid "D&escription" msgstr "Описани&е" -#: src/YQPackageSelector.cc:533 +#: src/YQPackageSelector.cc:539 msgid "&Technical Data" msgstr "&Технические данные" -#: src/YQPackageSelector.cc:546 src/YQPkgProductDialog.cc:115 +#: src/YQPackageSelector.cc:552 src/YQPkgProductDialog.cc:115 msgid "Dependencies" msgstr "Зависимости" -#: src/YQPackageSelector.cc:562 +#: src/YQPackageSelector.cc:567 msgid "&Versions" msgstr "&Версии" -#: src/YQPackageSelector.cc:580 +#: src/YQPackageSelector.cc:585 msgid "File List" msgstr "Список файлов" -#: src/YQPackageSelector.cc:597 +#: src/YQPackageSelector.cc:602 msgid "Change Log" msgstr "Журнал изменений" #. "Cancel" button #. button #0 #. text -#: src/YQPackageSelector.cc:624 src/YQPackageSelectorBase.cc:194 +#. button #0 +#: src/YQPackageSelector.cc:629 src/YQPackageSelectorBase.cc:194 #: src/YQPackageSelectorBase.cc:249 src/YQPackageSelectorBase.cc:305 #: src/YQPackageSelectorBase.cc:326 src/YQPatternSelector.cc:259 #: src/YQPkgConflictDialog.cc:163 src/YQPkgConflictDialog.cc:398 #: src/YQPkgSearchFilterView.cc:245 src/YQPkgTextDialog.cc:258 -#: src/YQSimplePatchSelector.cc:219 +#: src/YQPkgVersionsView.cc:429 src/YQSimplePatchSelector.cc:219 msgid "&Cancel" msgstr "&Отмена" #. Translators: "Accept" here refers to licenses or similar -#: src/YQPackageSelector.cc:634 src/YQPatternSelector.cc:268 +#: src/YQPackageSelector.cc:639 src/YQPatternSelector.cc:268 #: src/YQPkgTextDialog.cc:258 src/YQSimplePatchSelector.cc:228 msgid "&Accept" msgstr "Прин&ять" -#: src/YQPackageSelector.cc:677 +#: src/YQPackageSelector.cc:682 msgid "&File" msgstr "&Файл" -#: src/YQPackageSelector.cc:679 +#: src/YQPackageSelector.cc:684 msgid "&Import..." msgstr "&Импорт..." -#: src/YQPackageSelector.cc:680 +#: src/YQPackageSelector.cc:685 msgid "&Export..." msgstr "&Экспорт..." -#: src/YQPackageSelector.cc:684 +#: src/YQPackageSelector.cc:689 msgid "E&xit -- Discard Changes" msgstr "Вы&ход — Отменить изменения" -#: src/YQPackageSelector.cc:685 +#: src/YQPackageSelector.cc:690 msgid "&Quit -- Save Changes" msgstr "Выход — Сохранить изменени&я" -#: src/YQPackageSelector.cc:697 +#: src/YQPackageSelector.cc:702 msgid "&Package" msgstr "&Пакет" -#: src/YQPackageSelector.cc:737 src/YQPkgPackageKitGroupsFilterView.cc:92 +#: src/YQPackageSelector.cc:742 src/YQPkgPackageKitGroupsFilterView.cc:92 #: src/YQPkgRepoFilterView.cc:149 msgid "All Packages" msgstr "Все пакеты" -#: src/YQPackageSelector.cc:739 src/YQPkgObjList.cc:430 +#: src/YQPackageSelector.cc:744 src/YQPkgObjList.cc:430 msgid "Update if newer version available" msgstr "Обновить, если есть версия новее" -#: src/YQPackageSelector.cc:742 src/YQPkgObjList.cc:415 -#: src/YQPkgObjList.cc:436 +#: src/YQPackageSelector.cc:747 src/YQPkgObjList.cc:415 src/YQPkgObjList.cc:436 msgid "Update unconditionally" msgstr "Обновить безоговорочно" -#: src/YQPackageSelector.cc:756 +#: src/YQPackageSelector.cc:761 msgid "&Patch" msgstr "Ис&правление" -#: src/YQPackageSelector.cc:783 +#: src/YQPackageSelector.cc:788 msgid "Confi&guration" msgstr "&Настройка" -#: src/YQPackageSelector.cc:784 +#: src/YQPackageSelector.cc:789 msgid "&Repositories..." msgstr "&Репозитории..." -#: src/YQPackageSelector.cc:785 +#: src/YQPackageSelector.cc:790 msgid "&Online Update..." msgstr "Сетев&ое обновление..." -#: src/YQPackageSelector.cc:795 +#: src/YQPackageSelector.cc:800 msgid "&Dependencies" msgstr "&Зависимости" -#: src/YQPackageSelector.cc:797 +#: src/YQPackageSelector.cc:802 msgid "&Check Now" msgstr "Проверить &сейчас" -#: src/YQPackageSelector.cc:798 +#: src/YQPackageSelector.cc:804 msgid "&Autocheck" msgstr "&Автопроверка" +#: src/YQPackageSelector.cc:809 +#, fuzzy +#| msgid "Recommended Packages" +msgid "Install &Recommended Packages" +msgstr "Рекомендованные пакеты" + #. Translators: Menu for view options (Use a noun, not a verb!) -#: src/YQPackageSelector.cc:811 +#: src/YQPackageSelector.cc:822 msgid "&Options" msgstr "Пара&метры" #. Translators: This is about packages ending in "-devel", so don't translate that "-devel"! -#: src/YQPackageSelector.cc:814 +#: src/YQPackageSelector.cc:825 msgid "Show -de&vel Packages" msgstr "Показать -de&vel пакеты" #. Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! -#: src/YQPackageSelector.cc:823 +#: src/YQPackageSelector.cc:834 msgid "Show -&debuginfo/-debugsource Packages" msgstr "Показать -&debuginfo/-debugsource пакеты" # Translators: button # TODO ... -#: src/YQPackageSelector.cc:831 +#: src/YQPackageSelector.cc:842 msgid "&System Verification Mode" msgstr "Режим проверки &системы" -#: src/YQPackageSelector.cc:836 -msgid "&Ignore Recommended Packages for Already Installed Packages" -msgstr "&Игнорировать рекомендованные пакеты для уже установленных пакетов" - -#: src/YQPackageSelector.cc:842 +#: src/YQPackageSelector.cc:847 msgid "&Cleanup when deleting packages" msgstr "&Удалять ставшие ненужными зависимости" -#: src/YQPackageSelector.cc:846 +#: src/YQPackageSelector.cc:851 msgid "&Allow vendor change" msgstr "Р&азрешить смену поставщика" -#: src/YQPackageSelector.cc:859 +#: src/YQPackageSelector.cc:864 msgid "E&xtras" msgstr "&Дополнительно" -#: src/YQPackageSelector.cc:861 +#: src/YQPackageSelector.cc:866 msgid "Show &Products" msgstr "Показать &продукты" -#: src/YQPackageSelector.cc:862 +#: src/YQPackageSelector.cc:867 msgid "Show P&ackage Changes" msgstr "Показать изменения п&акетов" -#: src/YQPackageSelector.cc:863 +#: src/YQPackageSelector.cc:868 msgid "Show &History" msgstr "Показать &историю" #. Translators: This is about packages ending in "-devel", so don't translate that "-devel"! -#: src/YQPackageSelector.cc:871 +#: src/YQPackageSelector.cc:876 msgid "Install All Matching -&devel Packages" msgstr "Установить все соответствующие пакеты -&devel" #. Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! -#: src/YQPackageSelector.cc:875 +#: src/YQPackageSelector.cc:880 msgid "Install All Matching -de&buginfo Packages" msgstr "Установить все соответствующие пакеты -de&buginfo" #. Translators: This is about packages ending in "-debugsource", so don't translate that "-debugsource"! -#: src/YQPackageSelector.cc:878 +#: src/YQPackageSelector.cc:883 msgid "Install All Matching -debug&source Packages" msgstr "Установить все соответствующие пакеты -de&bugsource" -#: src/YQPackageSelector.cc:883 +#: src/YQPackageSelector.cc:885 +#, fuzzy +#| msgid "Install All Matching -&devel Packages" +msgid "Install All Matching &Recommended Packages" +msgstr "Установить все соответствующие пакеты -&devel" + +#: src/YQPackageSelector.cc:891 msgid "Generate Dependency Resolver &Test Case" msgstr "Генерировать кон&трольный пример разрешения зависимостей" -#: src/YQPackageSelector.cc:903 +#: src/YQPackageSelector.cc:911 msgid "&Help" msgstr "Справ&ка" #. Note: The help functions and their texts are moved out #. to a separate source file YQPackageSelectorHelp.cc #. Menu entry for help overview -#: src/YQPackageSelector.cc:909 +#: src/YQPackageSelector.cc:917 msgid "&Overview" msgstr "&Обзор" #. Menu entry for help about used symbols ( icons ) -#: src/YQPackageSelector.cc:912 +#: src/YQPackageSelector.cc:920 msgid "&Symbols" msgstr "&Символы" #. Menu entry for keyboard help -#: src/YQPackageSelector.cc:915 +#: src/YQPackageSelector.cc:923 msgid "&Keys" msgstr "&Клавиши" -#: src/YQPackageSelector.cc:1101 +#: src/YQPackageSelector.cc:1109 msgid "All package dependencies are OK." msgstr "Все зависимости пакетов удовлетворены." -#: src/YQPackageSelector.cc:1117 +#: src/YQPackageSelector.cc:1125 msgid "P&atches" msgstr "Испр&авления" #. startsWith #. filter -#: src/YQPackageSelector.cc:1179 +#: src/YQPackageSelector.cc:1187 msgid "Save Package List" msgstr "Сохранить список пакетов" @@ -274,59 +282,59 @@ #. parent #. Post error popup. #. parent -#: src/YQPackageSelector.cc:1218 src/YQPackageSelector.cc:1312 +#: src/YQPackageSelector.cc:1226 src/YQPackageSelector.cc:1320 #: src/YQPkgConflictDialog.cc:425 src/YQPkgConflictList.cc:201 #: src/YQPkgList.cc:605 msgid "Error" msgstr "Ошибка" #. caption -#: src/YQPackageSelector.cc:1219 +#: src/YQPackageSelector.cc:1227 msgid "Error exporting package list to %1" msgstr "Ошибка при экспорте списка пакетов в %1" -#: src/YQPackageSelector.cc:1231 +#: src/YQPackageSelector.cc:1239 msgid "Load Package List" msgstr "Загрузить список пакетов" #. caption -#: src/YQPackageSelector.cc:1313 +#: src/YQPackageSelector.cc:1321 msgid "Error loading package list from %1" msgstr "Ошибка загрузки списка пакетов из %1" #. caption #. Translators: %1 is the number of affected packages -#: src/YQPackageSelector.cc:1415 +#: src/YQPackageSelector.cc:1423 msgid "%1 packages will be updated" msgstr "Будет обновлено пакетов: %1" -#: src/YQPackageSelector.cc:1416 +#: src/YQPackageSelector.cc:1424 msgid "&Continue" msgstr "Продолж&ить" -#: src/YQPackageSelector.cc:1416 +#: src/YQPackageSelector.cc:1424 msgid "C&ancel" msgstr "Отмен&а" -#: src/YQPackageSelector.cc:1455 +#: src/YQPackageSelector.cc:1463 msgid "<p><small><a href=\"repoupgraderemove:///%1\">Cancel switching</a> system packages to versions in repository %2</small></p>" msgstr "<p><small><a href=\"repoupgraderemove:///%1\">Отменить переход</a> системных пакетов на версии из репозитория %2</small></p>" -#: src/YQPackageSelector.cc:1474 +#: src/YQPackageSelector.cc:1482 msgid "<p><a href=\"repoupgradeadd:///%1\">Switch system packages</a> to the versions in this repository (%2)</p>" msgstr "<p><a href=\"repoupgradeadd:///%1\">Перевести системные пакеты</a> на версии из этого репозитория (%2)</p>" -#: src/YQPackageSelector.cc:1697 +#: src/YQPackageSelector.cc:1571 src/YQPackageSelector.cc:1726 msgid "Added Subpackages:" msgstr "Добавленные под-пакеты:" #. "OK" button #. addHStretch( hbox ); #. "OK" button -#: src/YQPackageSelector.cc:1699 src/YQPackageSelectorBase.cc:214 -#: src/YQPkgDescriptionDialog.cc:120 src/YQPkgDiskUsageList.cc:156 -#: src/YQPkgDiskUsageList.cc:165 src/YQPkgProductDialog.cc:135 -#: src/YQPkgTextDialog.cc:71 +#: src/YQPackageSelector.cc:1572 src/YQPackageSelector.cc:1728 +#: src/YQPackageSelectorBase.cc:214 src/YQPkgDescriptionDialog.cc:120 +#: src/YQPkgDiskUsageList.cc:156 src/YQPkgDiskUsageList.cc:165 +#: src/YQPkgProductDialog.cc:135 src/YQPkgTextDialog.cc:71 msgid "&OK" msgstr "&OK" @@ -373,7 +381,7 @@ msgstr "В дополнение к выбранным вами пакетам для удовлетворения зависимостей был изменен статус следующих пакетов:" #: src/YQPackageSelectorBase.cc:305 src/YQPackageSelectorBase.cc:326 -#: src/YQPkgConflictDialog.cc:397 +#: src/YQPkgConflictDialog.cc:397 src/YQPkgVersionsView.cc:428 msgid "C&ontinue" msgstr "Пр&одолжить" @@ -1522,10 +1530,43 @@ "Наиболее безопасный путь — удалить их.\n" "</p>" -#: src/YQPkgVersionsView.cc:211 +#: src/YQPkgVersionsView.cc:207 msgid "%1-%2 from vendor %3 (installed)" msgstr "%1-%2 от %3 (установлено)" +#. Translators: Popup dialog text. Try to keep the lines about the same length. +#: src/YQPkgVersionsView.cc:398 +msgid "" +"You are trying to install multiversion-capable\n" +"and non-multiversion-capable versions of this\n" +"package at the same time." +msgstr "" + +#: src/YQPkgVersionsView.cc:406 +msgid "" +"This version is multiversion-capable.\n" +"\n" +"Press \"Continue\" to install this version\n" +"and unselect the non-multiversion-capable version,\n" +"\"Cancel\" to unselect this version and keep the other one." +msgstr "" + +#: src/YQPkgVersionsView.cc:415 +msgid "" +"This version is not multiversion-capable.\n" +"\n" +"Press \"Continue\" to install only this version\n" +"and unselect all other versions,\n" +"\"Cancel\" to unselect this version and keep the other ones." +msgstr "" + +#. Dialog heading +#: src/YQPkgVersionsView.cc:423 +#, fuzzy +#| msgid "Unmaintained Packages" +msgid "Incompatible Package Versions" +msgstr "Неразрабатываемые пакеты" + #. Translators: %1 is a package version, %2 the package architecture, #. %3 describes the repository where it comes from, #. %4 is the repository's priority @@ -1533,13 +1574,13 @@ #. Examples: #. 2.5.23-i568 from Packman with priority 100 and vendor openSUSE #. 3.17.4-i386 from openSUSE-11.1 update repository with priority 20 and vendor openSUSE -#. ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^ -#. %1 %2 %3 %4 %5 -#: src/YQPkgVersionsView.cc:365 src/YQPkgVersionsView.cc:402 +#. ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^ +#. %1 %2 %3 %4 %5 +#: src/YQPkgVersionsView.cc:549 src/YQPkgVersionsView.cc:586 msgid "%1-%2 from %3 with priority %4 and vendor %5" msgstr "%1-%2 из %3 с приоритетом %4 от %5" -#: src/YQPkgVersionsView.cc:386 +#: src/YQPkgVersionsView.cc:570 msgid "This version is installed in your system." msgstr "Эта версия уже установлена в вашей системе." @@ -1551,6 +1592,9 @@ msgid "Package libqdialogsolver is required for this feature." msgstr "Для этой возможности необходим пакет libqdialogsolver." +#~ msgid "&Ignore Recommended Packages for Already Installed Packages" +#~ msgstr "&Игнорировать рекомендованные пакеты для уже установленных пакетов" + #~ msgid "Close the current page" #~ msgstr "Закрыть текущую страницу"