diff options
author | Daniel Burrows <dburrows@debian.org> | 2009-07-20 12:28:46 -0700 |
---|---|---|
committer | Daniel Burrows <dburrows@debian.org> | 2009-07-20 12:28:46 -0700 |
commit | ccf5cb2ea1ad5b032aa547279400d8b798c556a2 (patch) | |
tree | 282d0645a77f64bec46a579ad3dc80e2341e459c /po/ru.po | |
parent | 5bbeb9e243bbe5539d414e8db7e0d1e1208d78f5 (diff) | |
download | aptitude-ccf5cb2ea1ad5b032aa547279400d8b798c556a2.tar.gz |
Update the pofiles.
Diffstat (limited to 'po/ru.po')
-rw-r--r-- | po/ru.po | 726 |
1 files changed, 347 insertions, 379 deletions
@@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude 0.4.11.3-1\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2009-04-26 20:39-0700\n" +"POT-Creation-Date: 2009-07-20 12:25-0700\n" "PO-Revision-Date: 2008-05-10 14:38+0400\n" "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -647,8 +647,8 @@ msgstr "Неустранимая ошибка в решателе" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] Разрешение зависимостей" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1221 -#: src/gtk/resolver.cc:1389 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1277 +#: src/gtk/resolver.cc:1445 src/solution_dialog.cc:140 #: src/solution_screen.cc:568 msgid "Internal error: unexpected null solution." msgstr "Внутренняя ошибка: неожиданно нет решения." @@ -1723,7 +1723,7 @@ msgstr "" "создан." #: src/cmdline/cmdline_resolver.cc:581 src/cmdline/cmdline_resolver.cc:874 -#: src/gtk/resolver.cc:1974 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2041 src/solution_dialog.cc:127 #: src/solution_screen.cc:545 msgid "Resolving dependencies..." msgstr "Разрешение зависимостей..." @@ -1828,7 +1828,7 @@ msgid "The following packages have unmet dependencies:\n" msgstr "Следующие пакеты имеют неудовлетворённые зависимости:\n" #: src/cmdline/cmdline_show.cc:172 src/cmdline/cmdline_show.cc:416 -#: src/gtk/resolver.cc:1124 src/solution_fragment.cc:60 +#: src/gtk/resolver.cc:1178 src/solution_fragment.cc:60 msgid "<NULL>" msgstr "<NULL>" @@ -1964,8 +1964,8 @@ msgstr "Автоматически установлен" msgid "no" msgstr "нет" -#: src/cmdline/cmdline_show.cc:391 src/gtk/packagestab.cc:722 -#: src/gtk/previewtab.cc:225 +#: src/cmdline/cmdline_show.cc:391 src/gtk/packagestab.cc:725 +#: src/gtk/previewtab.cc:230 msgid "Version: " msgstr "Версия: " @@ -2044,12 +2044,12 @@ msgid "Obsoletes" msgstr "Устаревшие" #: src/cmdline/cmdline_show.cc:437 src/cmdline/cmdline_why.cc:251 -#: src/cmdline/cmdline_why.cc:1505 src/gtk/dependency_chains_tab.cc:200 +#: src/cmdline/cmdline_why.cc:1505 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "Предоставляют" #: src/cmdline/cmdline_show.cc:441 src/gtk/info.cc:702 -#: src/gtk/packagestab.cc:730 src/gtk/previewtab.cc:233 +#: src/gtk/packagestab.cc:733 src/gtk/previewtab.cc:238 #: src/pkg_info_screen.cc:102 msgid "Description: " msgstr "Описание: " @@ -2207,8 +2207,7 @@ msgstr "Текущая" msgid "Candidate" msgstr "Кандидат" -#: src/cmdline/cmdline_why.cc:342 src/gtk/aptitude.glade:622 src/gtk/gui.cc:89 -#: src/gtk/gui.cc:1365 +#: src/cmdline/cmdline_why.cc:342 src/gtk/gui.cc:89 src/gtk/gui.cc:1365 msgid "Install" msgstr "Установить" @@ -2349,7 +2348,7 @@ msgstr "НЕУДОВЛЕТВОРИТЕЛЬНЫЙ" msgid "UNAVAILABLE" msgstr "НЕДОСТУПНЫЙ" -#: src/desc_render.cc:133 src/gtk/aptitude.glade:1144 +#: src/desc_render.cc:133 src/gtk/aptitude.glade:1054 msgid "Tags" msgstr "Теги" @@ -2625,54 +2624,54 @@ msgid "" "a number." msgstr "" -#: src/generic/apt/aptitude_resolver_universe.cc:827 +#: src/generic/apt/aptitude_resolver_universe.cc:834 #, c-format msgid "" "Invalid search tier \"%s\" (not \"conflict\", \"minimum\", or an integer)." msgstr "" -#: src/generic/apt/aptitude_resolver_universe.cc:871 +#: src/generic/apt/aptitude_resolver_universe.cc:878 #, fuzzy #| msgid "Section" msgid "Safe actions" msgstr "Раздел" -#: src/generic/apt/aptitude_resolver_universe.cc:872 +#: src/generic/apt/aptitude_resolver_universe.cc:879 #, fuzzy #| msgid "Canc^el pending actions" msgid "Cancel all user actions" msgstr "Отменить все незаконченные действия" -#: src/generic/apt/aptitude_resolver_universe.cc:873 +#: src/generic/apt/aptitude_resolver_universe.cc:880 #, fuzzy #| msgid "'-' to remove packages" msgid "Remove packages" msgstr "'-' удалить пакеты" -#: src/generic/apt/aptitude_resolver_universe.cc:874 +#: src/generic/apt/aptitude_resolver_universe.cc:881 #, fuzzy #| msgid "not a real package" msgid "Modify held packages" msgstr "не реальный пакет" -#: src/generic/apt/aptitude_resolver_universe.cc:875 +#: src/generic/apt/aptitude_resolver_universe.cc:882 msgid "Install versions from non-default sources" msgstr "" -#: src/generic/apt/aptitude_resolver_universe.cc:876 +#: src/generic/apt/aptitude_resolver_universe.cc:883 #, fuzzy #| msgid "Remove the following packages:" msgid "Remove essential packages" msgstr "Удалить следующие пакеты:" -#: src/generic/apt/aptitude_resolver_universe.cc:909 +#: src/generic/apt/aptitude_resolver_universe.cc:916 #, c-format msgid "" "The tier \"%s\", configured in %s::ProblemResolver::Tier-Names, is missing a " "Tier entry." msgstr "" -#: src/generic/apt/aptitude_resolver_universe.cc:913 +#: src/generic/apt/aptitude_resolver_universe.cc:920 #, c-format msgid "" "The tier %d, configured in %s::ProblemResolver::Tier-Names, is missing a " @@ -3128,98 +3127,44 @@ msgstr "" msgid "_File" msgstr "False" -#: src/gtk/aptitude.glade:26 src/ui.cc:2220 +#: src/gtk/aptitude.glade:27 src/ui.cc:2220 msgid "Perform all pending installs and removals" msgstr "Выполнить все незаконченные установки и удаления" -#: src/gtk/aptitude.glade:27 -#, fuzzy -#| msgid "^Install/remove packages" -msgid "_Install/Remove Packages" -msgstr "^Установить/удалить пакеты" - -#: src/gtk/aptitude.glade:42 src/ui.cc:2223 +#: src/gtk/aptitude.glade:37 src/ui.cc:2223 msgid "Check for new versions of packages" msgstr "Проверить, есть ли новые версии пакетов" -#: src/gtk/aptitude.glade:43 -#, fuzzy -#| msgid "^Update package list" -msgid "_Update Package List" -msgstr "^Обновить список пакетов" - -#: src/gtk/aptitude.glade:63 src/ui.cc:2228 +#: src/gtk/aptitude.glade:52 src/ui.cc:2228 msgid "Mark all upgradable packages which are not held for upgrade" msgstr "" "Пометить все обновляемые пакеты, которые не зафиксированы от обновления" -#: src/gtk/aptitude.glade:64 -#, fuzzy -#| msgid "Mark Up^gradable" -msgid "Mark Up_gradable" -msgstr "Пометить ^обновляемые" - -#: src/gtk/aptitude.glade:79 src/ui.cc:2233 +#: src/gtk/aptitude.glade:62 src/ui.cc:2233 msgid "Forget which packages are \"new\"" msgstr "Забыть о \"новых\" пакетах" -#: src/gtk/aptitude.glade:80 -#, fuzzy -#| msgid "^Forget new packages" -msgid "_Forget New Packages" -msgstr "^Забыть о новых пакетах" - -#: src/gtk/aptitude.glade:94 src/ui.cc:2237 +#: src/gtk/aptitude.glade:71 src/ui.cc:2237 msgid "Cancel all pending installations, removals, holds, and upgrades." msgstr "Отменить все незаконченные установки, удаления, фиксации и обновления." -#: src/gtk/aptitude.glade:95 -#, fuzzy -#| msgid "Canc^el pending actions" -msgid "Canc_el Pending Actions" -msgstr "Отменить все незаконченные действия" - -#: src/gtk/aptitude.glade:109 src/ui.cc:2241 +#: src/gtk/aptitude.glade:80 src/ui.cc:2241 msgid "Delete package files which were previously downloaded" msgstr "Удалить ранее загруженные файлы пакетов" -#: src/gtk/aptitude.glade:110 -#, fuzzy -#| msgid "^Clean package cache" -msgid "C_lean Package Cache" -msgstr "^Очистить кеш пакетов" - -#: src/gtk/aptitude.glade:124 src/ui.cc:2245 +#: src/gtk/aptitude.glade:89 src/ui.cc:2245 msgid "Delete package files which can no longer be downloaded" msgstr "Удалить файлы пакетов, которые больше никогда не будут загружены" -#: src/gtk/aptitude.glade:125 -#, fuzzy -#| msgid "Clean ^obsolete files" -msgid "Clean _Obsolete Files" -msgstr "Очистить ^устаревшие файлы" - -#: src/gtk/aptitude.glade:144 src/ui.cc:2252 +#: src/gtk/aptitude.glade:103 src/ui.cc:2252 msgid "Reload the package cache" msgstr "Перезагрузить кеш пакетов." -#: src/gtk/aptitude.glade:145 -#, fuzzy -#| msgid "^Reload package cache" -msgid "_Reload Package Cache" -msgstr "^Перезагрузить кеш пакетов" - -#: src/gtk/aptitude.glade:159 src/ui.cc:1701 src/ui.cc:2257 +#: src/gtk/aptitude.glade:112 src/ui.cc:1701 src/ui.cc:2257 msgid "Waste time trying to find mines" msgstr "Убьём время в поисках мин" -#: src/gtk/aptitude.glade:160 -#, fuzzy -#| msgid "^Play Minesweeper" -msgid "_Play Minesweeper" -msgstr "^Играть в сапёра" - -#: src/gtk/aptitude.glade:179 src/ui.cc:2262 +#: src/gtk/aptitude.glade:126 src/ui.cc:2262 msgid "" "Run 'su' to become root; this will restart the program, but your settings " "will be preserved" @@ -3227,261 +3172,200 @@ msgstr "" "Запуск 'su', чтобы стать суперпользователем. Это приведёт к перезапуску " "программы, но ваши настройки будут сохранены" -#: src/gtk/aptitude.glade:180 -#, fuzzy -#| msgid "Become root" -msgid "_Become Root" -msgstr "Стать суперпользователем" - -#: src/gtk/aptitude.glade:194 src/ui.cc:2265 +#: src/gtk/aptitude.glade:135 src/ui.cc:2265 msgid "Exit the program" msgstr "Завершить работу программы" -#: src/gtk/aptitude.glade:195 -#, fuzzy -#| msgid "^Quit" -msgid "_Quit" -msgstr "^Выйти" - -#: src/gtk/aptitude.glade:212 +#: src/gtk/aptitude.glade:147 msgid "E_dit" msgstr "" -#: src/gtk/aptitude.glade:220 src/ui.cc:2272 +#: src/gtk/aptitude.glade:156 src/ui.cc:2272 msgid "Undo the last package operation or group of operations" msgstr "Отменить последнюю операцию с пакетом или группу операций" -#: src/gtk/aptitude.glade:221 -msgid "gtk-undo" -msgstr "" - -#: src/gtk/aptitude.glade:234 -msgid "gtk-cut" -msgstr "" - -#: src/gtk/aptitude.glade:242 -msgid "gtk-copy" -msgstr "" - -#: src/gtk/aptitude.glade:250 -msgid "gtk-paste" -msgstr "" - -#: src/gtk/aptitude.glade:258 -#, fuzzy -#| msgid "delete" -msgid "gtk-delete" -msgstr "delete" - -#: src/gtk/aptitude.glade:270 +#: src/gtk/aptitude.glade:205 #, fuzzy #| msgid "Package" msgid "_Package" msgstr "Пакет" -#: src/gtk/aptitude.glade:282 +#: src/gtk/aptitude.glade:217 #, fuzzy #| msgid "Views" msgid "_View" msgstr "Окна" -#: src/gtk/aptitude.glade:290 +#: src/gtk/aptitude.glade:226 msgid "Change which columns are visible in the currently active view." msgstr "" -#: src/gtk/aptitude.glade:291 -msgid "_Edit Columns..." -msgstr "" - -#: src/gtk/aptitude.glade:310 +#: src/gtk/aptitude.glade:240 msgid "" "View errors that have occurred in the apt system since the program was " "started." msgstr "" -#: src/gtk/aptitude.glade:311 -msgid "View Apt _Errors" -msgstr "" - -#: src/gtk/aptitude.glade:325 +#: src/gtk/aptitude.glade:249 msgid "Find chains of dependencies linking one package to another." msgstr "" -#: src/gtk/aptitude.glade:326 -#, fuzzy -#| msgid "Dependency handling" -msgid "Find _Dependency Chains" -msgstr "Работа с зависимостями" - -#: src/gtk/aptitude.glade:345 -msgid "gtk-go-back" -msgstr "" - -#: src/gtk/aptitude.glade:355 -msgid "gtk-go-forward" -msgstr "" - -#: src/gtk/aptitude.glade:365 src/gtk/aptitude.glade:765 -#, fuzzy -#| msgid "delete" -msgid "gtk-close" -msgstr "delete" - -#: src/gtk/aptitude.glade:379 +#: src/gtk/aptitude.glade:296 #, fuzzy #| msgid "Help" msgid "_Help" msgstr "Помощь" -#: src/gtk/aptitude.glade:387 -msgid "gtk-about" -msgstr "" - -#: src/gtk/aptitude.glade:407 src/gtk/dashboardtab.cc:750 src/gtk/gui.cc:1554 +#: src/gtk/aptitude.glade:325 src/gtk/dashboardtab.cc:751 src/gtk/gui.cc:1554 #: src/gtk/gui.cc:1748 msgid "Dashboard" msgstr "" -#: src/gtk/aptitude.glade:422 +#: src/gtk/aptitude.glade:344 #, fuzzy #| msgid "List Update" msgid "Update" msgstr "Обновление списка" -#: src/gtk/aptitude.glade:432 src/gtk/gui.cc:1266 src/ui.cc:837 src/ui.cc:839 +#: src/gtk/aptitude.glade:355 src/gtk/gui.cc:1266 src/ui.cc:837 src/ui.cc:839 #: src/ui.cc:884 src/ui.cc:886 src/ui.cc:912 src/ui.cc:914 src/ui.cc:935 #: src/ui.cc:937 msgid "Packages" msgstr "Пакеты" -#: src/gtk/aptitude.glade:442 src/gtk/gui.cc:977 src/gtk/previewtab.cc:116 +#: src/gtk/aptitude.glade:366 src/gtk/gui.cc:977 src/gtk/previewtab.cc:118 #: src/ui.cc:1336 msgid "Preview" msgstr "Предпросмотр" -#: src/gtk/aptitude.glade:452 src/gtk/gui.cc:972 src/ui.cc:2653 +#: src/gtk/aptitude.glade:377 src/gtk/gui.cc:972 src/ui.cc:2653 msgid "Resolver" msgstr "Решатель" -#: src/gtk/aptitude.glade:462 +#: src/gtk/aptitude.glade:388 #, fuzzy #| msgid "Installed" msgid "Install/Remove" msgstr "Установлен" -#: src/gtk/aptitude.glade:635 src/gtk/gui.cc:93 src/gtk/gui.cc:1372 -msgid "Remove" -msgstr "Удалить" - -#: src/gtk/aptitude.glade:648 src/gtk/gui.cc:1377 -#, fuzzy -#| msgid "^Purge" -msgid "Purge" -msgstr "^Purge" - -#: src/gtk/aptitude.glade:661 src/gtk/gui.cc:1382 -msgid "Keep" -msgstr "Оставить" - -#: src/gtk/aptitude.glade:674 src/gtk/gui.cc:1387 -msgid "Hold" -msgstr "Фиксировать" - -#: src/gtk/aptitude.glade:687 +#: src/gtk/aptitude.glade:590 msgid "Edit Columns..." msgstr "" -#: src/gtk/aptitude.glade:700 +#: src/gtk/aptitude.glade:603 msgid "Dummy label (will be replaced at runtime)." msgstr "" -#: src/gtk/aptitude.glade:731 +#: src/gtk/aptitude.glade:631 #, fuzzy #| msgid "Remove the filter from the package list" msgid "Make this the default for new package lists." msgstr "Снять фильтр со списка пакетов" -#: src/gtk/aptitude.glade:747 +#: src/gtk/aptitude.glade:646 #, fuzzy #| msgid "Apply a filter to the package list" msgid "Apply these settings to all active package lists." msgstr "Применить фильтр к списку пакетов" -#: src/gtk/aptitude.glade:811 src/gtk/aptitude.glade:1490 -#: src/gtk/aptitude.glade:1809 src/gtk/aptitude.glade:1945 +#: src/gtk/aptitude.glade:664 +#, fuzzy +#| msgid "delete" +msgid "gtk-close" +msgstr "delete" + +#: src/gtk/aptitude.glade:719 src/gtk/aptitude.glade:1425 +#: src/gtk/aptitude.glade:1754 src/gtk/aptitude.glade:1892 #, fuzzy #| msgid "Search" msgid "Search:" msgstr "Поиск" -#: src/gtk/aptitude.glade:831 src/gtk/aptitude.glade:1510 -#: src/gtk/aptitude.glade:1829 src/gtk/aptitude.glade:1965 +#: src/gtk/aptitude.glade:737 src/gtk/aptitude.glade:1443 +#: src/gtk/aptitude.glade:1772 src/gtk/aptitude.glade:1910 msgid "gtk-find" msgstr "" -#: src/gtk/aptitude.glade:845 +#: src/gtk/aptitude.glade:750 #, fuzzy #| msgid "reinstall" msgid "Incremental" msgstr "reinstall" -#: src/gtk/aptitude.glade:862 src/gtk/aptitude.glade:1528 -#: src/gtk/aptitude.glade:1847 src/gtk/aptitude.glade:1983 +#: src/gtk/aptitude.glade:770 src/gtk/aptitude.glade:1464 +#: src/gtk/aptitude.glade:1793 src/gtk/aptitude.glade:1931 #, fuzzy #| msgid "Err " msgid "Errors" msgstr "Ош " -#: src/gtk/aptitude.glade:879 src/gtk/aptitude.glade:1864 -#: src/gtk/aptitude.glade:2000 +#: src/gtk/aptitude.glade:787 src/gtk/aptitude.glade:1810 +#: src/gtk/aptitude.glade:1948 msgid "Show " msgstr "" -#: src/gtk/aptitude.glade:986 +#: src/gtk/aptitude.glade:895 msgid "<span size=\"xx-large\">Versions:</span>" msgstr "" -#: src/gtk/aptitude.glade:1046 +#: src/gtk/aptitude.glade:956 #, fuzzy #| msgid "Dependencies of %s" msgid "Dependencies" msgstr "Зависимости от %s" -#: src/gtk/aptitude.glade:1076 +#: src/gtk/aptitude.glade:986 #, fuzzy #| msgid "^Changelog" msgid "Changelog" msgstr "^ChangeLog" -#: src/gtk/aptitude.glade:1104 +#: src/gtk/aptitude.glade:1014 #, fuzzy #| msgid "False" msgid "Files" msgstr "False" -#: src/gtk/aptitude.glade:1115 +#: src/gtk/aptitude.glade:1025 msgid "popcon" msgstr "" -#: src/gtk/aptitude.glade:1124 +#: src/gtk/aptitude.glade:1034 msgid "Popcon" msgstr "" -#: src/gtk/aptitude.glade:1135 +#: src/gtk/aptitude.glade:1045 #, fuzzy #| msgid "Tags" msgid "tags" msgstr "Теги" -#: src/gtk/aptitude.glade:1192 +#: src/gtk/aptitude.glade:1106 msgid "Fixing upgrade manually:" msgstr "" -#: src/gtk/aptitude.glade:1202 src/gtk/dashboardtab.cc:536 +#: src/gtk/aptitude.glade:1116 src/gtk/dashboardtab.cc:537 msgid "Calculating upgrade..." msgstr "" -#: src/gtk/aptitude.glade:1229 +#: src/gtk/aptitude.glade:1164 +msgid "<b>Solutions</b>" +msgstr "" + +#: src/gtk/aptitude.glade:1182 src/gtk/download.cc:261 +#: src/gtk/entityview.cc:551 +#, fuzzy +#| msgid "State" +msgid "Status" +msgstr "Состояние" + +#: src/gtk/aptitude.glade:1216 +#, fuzzy +#| msgid "Unknown action type: %s" +msgid "Group by action type" +msgstr "Неизвестный тип действия: %s" + +#: src/gtk/aptitude.glade:1220 msgid "" "Arrange the actions of the current solution so that actions that are of the " "same type are placed together (for instance, all the actions that remove " @@ -3490,148 +3374,131 @@ msgid "" "This is the default view mode." msgstr "" -#: src/gtk/aptitude.glade:1232 -#, fuzzy -#| msgid "Unknown action type: %s" -msgid "Group by action type" -msgstr "Неизвестный тип действия: %s" +#: src/gtk/aptitude.glade:1234 +msgid "Group by dependency" +msgstr "" -#: src/gtk/aptitude.glade:1245 +#: src/gtk/aptitude.glade:1238 msgid "" "Show the order in which the actions in the current solution were performed " "and the dependency that triggered each action." msgstr "" -#: src/gtk/aptitude.glade:1246 -msgid "Show an explanation of the solution" -msgstr "" - -#: src/gtk/aptitude.glade:1263 +#: src/gtk/aptitude.glade:1255 msgid "<b>View Mode</b>" msgstr "" -#: src/gtk/aptitude.glade:1307 +#: src/gtk/aptitude.glade:1297 #, fuzzy #| msgid "Toggle ^Rejected" msgid "Rejected" msgstr "Переключить отказы" -#: src/gtk/aptitude.glade:1317 +#: src/gtk/aptitude.glade:1312 #, fuzzy #| msgid "Preferences" msgid "No preference" msgstr "Настройки" -#: src/gtk/aptitude.glade:1331 +#: src/gtk/aptitude.glade:1328 msgid "Accepted" msgstr "" -#: src/gtk/aptitude.glade:1347 +#: src/gtk/aptitude.glade:1348 msgid "<b>Status of selected action</b>" msgstr "" -#: src/gtk/aptitude.glade:1364 src/gtk/download.cc:261 -#: src/gtk/entityview.cc:551 +#: src/gtk/aptitude.glade:1369 #, fuzzy -#| msgid "State" -msgid "Status" -msgstr "Состояние" - -#: src/gtk/aptitude.glade:1415 -msgid "<b>Solutions</b>" -msgstr "" +#| msgid "^Examine Solution" +msgid "Find a new solution" +msgstr "^Рассмотреть решение" -#: src/gtk/aptitude.glade:1442 +#: src/gtk/aptitude.glade:1373 #, fuzzy #| msgid "Select the next solution to the dependency problems." msgid "Calculate the next solution that has not yet been generated." msgstr "Выбрать следующее решение проблем с зависимостями." -#: src/gtk/aptitude.glade:1443 -#, fuzzy -#| msgid "^Examine Solution" -msgid "Find a new solution" -msgstr "^Рассмотреть решение" +#: src/gtk/aptitude.glade:1383 +msgid "gtk-apply" +msgstr "" -#: src/gtk/aptitude.glade:1457 +#: src/gtk/aptitude.glade:1388 #, fuzzy #| msgid "Perform the actions contained in the currently selected solution." msgid "" "Perform the actions in the currently selected solution and close this tab." msgstr "Выполнить действия из выделенного решения." -#: src/gtk/aptitude.glade:1458 -msgid "gtk-apply" -msgstr "" - -#: src/gtk/aptitude.glade:1607 +#: src/gtk/aptitude.glade:1543 #, fuzzy #| msgid "Upgrade" msgid "Upgrade Summary" msgstr "Обновить" -#: src/gtk/aptitude.glade:1636 +#: src/gtk/aptitude.glade:1572 #, fuzzy #| msgid "Source Package: " msgid "Selected Package" msgstr "Исходный пакет: " -#: src/gtk/aptitude.glade:1667 +#: src/gtk/aptitude.glade:1607 msgid "" "Label explaining the upgrade. This text will not appear in the program at " "runtime." msgstr "" -#: src/gtk/aptitude.glade:1682 +#: src/gtk/aptitude.glade:1619 #, fuzzy #| msgid "Manual" msgid "Fix Manually" msgstr "Руководство" -#: src/gtk/aptitude.glade:1691 src/gtk/gui.cc:91 src/gtk/gui.cc:1356 +#: src/gtk/aptitude.glade:1632 src/gtk/gui.cc:91 src/gtk/gui.cc:1356 msgid "Upgrade" msgstr "Обновить" -#: src/gtk/aptitude.glade:1718 +#: src/gtk/aptitude.glade:1663 msgid "<b>Available Upgrades:</b>" msgstr "" -#: src/gtk/aptitude.glade:1911 +#: src/gtk/aptitude.glade:1858 msgid "<b>Start at these packages:</b>" msgstr "" -#: src/gtk/aptitude.glade:2047 +#: src/gtk/aptitude.glade:1996 msgid "<b>End at these packages:</b>" msgstr "" -#: src/gtk/aptitude.glade:2115 +#: src/gtk/aptitude.glade:2064 msgid "A terminal running dpkg will appear here." msgstr "" -#: src/gtk/aptitude.glade:2127 +#: src/gtk/aptitude.glade:2076 msgid "" "Placeholder label for the explanation that two conffiles are being " "compared.\n" "This text should not appear in the program." msgstr "" -#: src/gtk/aptitude.glade:2153 +#: src/gtk/aptitude.glade:2105 msgid "View the differences\t" msgstr "" -#: src/gtk/aptitude.glade:2179 +#: src/gtk/aptitude.glade:2131 msgid "" "Do you want to apply these changes?\n" "You can also modify the files by hand, then click \"No\"." msgstr "" -#: src/gtk/aptitude.glade:2191 +#: src/gtk/aptitude.glade:2143 #, fuzzy #| msgid "yes" msgid "gtk-yes" msgstr "да" -#: src/gtk/aptitude.glade:2201 +#: src/gtk/aptitude.glade:2157 msgid "gtk-no" msgstr "" @@ -3684,21 +3551,21 @@ msgstr "Загрузка Changelog" msgid "Downloading changelogs" msgstr "Загрузка Changelog" -#: src/gtk/dashboardtab.cc:210 +#: src/gtk/dashboardtab.cc:211 msgid "Resolve Upgrade Manually" msgstr "" -#: src/gtk/dashboardtab.cc:306 +#: src/gtk/dashboardtab.cc:307 #, fuzzy #| msgid "URL to use to download changelogs" msgid "Preparing to download changelogs" msgstr "URL для загрузки списков изменений" -#: src/gtk/dashboardtab.cc:396 +#: src/gtk/dashboardtab.cc:397 msgid "Available upgrades:" msgstr "" -#: src/gtk/dashboardtab.cc:413 +#: src/gtk/dashboardtab.cc:414 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -3708,19 +3575,19 @@ msgstr[0] "%d обновлён" msgstr[1] "%d обновлено" msgstr[2] "%d обновлено" -#: src/gtk/dashboardtab.cc:629 +#: src/gtk/dashboardtab.cc:630 #, fuzzy #| msgid "Not Installed" msgid "No upgrades are available." msgstr "Не установлен" -#: src/gtk/dashboardtab.cc:641 +#: src/gtk/dashboardtab.cc:642 #, fuzzy #| msgid "Unable to locate package %s" msgid "Unable to calculate an upgrade." msgstr "Не удалось найти пакет %s" -#: src/gtk/dashboardtab.cc:650 +#: src/gtk/dashboardtab.cc:651 #, c-format msgid "" "Press \"%s\" to install <span size='large'>%d</span> upgrade out of <span " @@ -3732,7 +3599,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/gtk/dashboardtab.cc:662 +#: src/gtk/dashboardtab.cc:663 #, c-format msgid "" "Press \"%s\" to manually attempt to install the remaining <span size='large'>" @@ -3744,49 +3611,49 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/gtk/dashboardtab.cc:687 +#: src/gtk/dashboardtab.cc:688 #, c-format msgid "" "Unable to calculate an upgrade. Press \"%s\" to manually search for a " "solution." msgstr "" -#: src/gtk/dashboardtab.cc:704 +#: src/gtk/dashboardtab.cc:705 #, fuzzy, c-format #| msgid "Internal error: Default column string is unparsable" msgid "Internal error encountered while calculating an upgrade: %s" msgstr "Внутренняя ошибка: Колонку строки по умолчанию нельзя разобрать" -#: src/gtk/dashboardtab.cc:836 +#: src/gtk/dashboardtab.cc:838 #, c-format msgid "" "The package %s has no candidate version and will not be upgraded; unable to " "show its changelog." msgstr "" -#: src/gtk/dependency_chains_tab.cc:77 +#: src/gtk/dependency_chains_tab.cc:78 #, fuzzy #| msgid "Dependency handling" msgid "Find dependency chains: start" msgstr "Работа с зависимостями" -#: src/gtk/dependency_chains_tab.cc:79 +#: src/gtk/dependency_chains_tab.cc:82 #, fuzzy #| msgid "Dependency handling" msgid "Find dependency chains: end" msgstr "Работа с зависимостями" -#: src/gtk/dependency_chains_tab.cc:81 +#: src/gtk/dependency_chains_tab.cc:86 #, fuzzy #| msgid "Dependency handling" msgid "Find dependency chains: results" msgstr "Работа с зависимостями" -#: src/gtk/dependency_chains_tab.cc:221 +#: src/gtk/dependency_chains_tab.cc:226 msgid "Select one or more starting packages and an ending package to search." msgstr "" -#: src/gtk/dependency_chains_tab.cc:276 +#: src/gtk/dependency_chains_tab.cc:281 #, fuzzy #| msgid "Dependency handling" msgid "No dependency chain found." @@ -4051,6 +3918,10 @@ msgstr "Переустановить" msgid "Downgrade" msgstr "Заменить на более старые" +#: src/gtk/gui.cc:93 src/gtk/gui.cc:1372 +msgid "Remove" +msgstr "Удалить" + #: src/gtk/gui.cc:94 msgid "Remove and purge configuration/data" msgstr "" @@ -4250,6 +4121,20 @@ msgstr "не установлен" msgid "Install/Upgrade" msgstr "Установлен" +#: src/gtk/gui.cc:1377 +#, fuzzy +#| msgid "^Purge" +msgid "Purge" +msgstr "^Purge" + +#: src/gtk/gui.cc:1382 +msgid "Keep" +msgstr "Оставить" + +#: src/gtk/gui.cc:1387 +msgid "Hold" +msgstr "Фиксировать" + #: src/gtk/gui.cc:1393 msgid "Set as automatic" msgstr "" @@ -4315,133 +4200,133 @@ msgstr "нет" msgid "Unknown" msgstr "Неизвестен" -#: src/gtk/packagestab.cc:60 +#: src/gtk/packagestab.cc:61 msgid "Parse error" msgstr "" -#: src/gtk/packagestab.cc:203 +#: src/gtk/packagestab.cc:204 #, fuzzy, c-format #| msgid "No packages matched the pattern \"%ls\"." msgid "No packages matched \"%s\"." msgstr "Нет пакетов, совпадающих с шаблоном \"%ls\"." -#: src/gtk/packagestab.cc:313 +#: src/gtk/packagestab.cc:314 msgid "Enter a search and click \"Find\" to display packages." msgstr "" -#: src/gtk/packagestab.cc:413 +#: src/gtk/packagestab.cc:416 #, fuzzy #| msgid "Package: " msgid "Packages: " msgstr "Пакет: " -#: src/gtk/packagestab.cc:490 +#: src/gtk/packagestab.cc:493 #, fuzzy, c-format #| msgid "%s versions" msgid "Upgrade to %s version %s" msgstr "%s версии" -#: src/gtk/packagestab.cc:498 +#: src/gtk/packagestab.cc:501 #, fuzzy, c-format #| msgid "Install(%s provides %s)" msgid "Install %s version %s" msgstr "Установить(%s предоставляет %s)" -#: src/gtk/packagestab.cc:506 +#: src/gtk/packagestab.cc:509 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "Downgrade to %s version %s" msgstr " Версия cwidget: %s\n" -#: src/gtk/packagestab.cc:517 +#: src/gtk/packagestab.cc:520 #, fuzzy, c-format #| msgid "Keep the following packages at their current version:" msgid "Don't hold %s at its current version." msgstr "Сохранить для следующих пакетов их текущие версии:" -#: src/gtk/packagestab.cc:520 src/gtk/packagestab.cc:540 -#: src/gtk/packagestab.cc:543 +#: src/gtk/packagestab.cc:523 src/gtk/packagestab.cc:543 +#: src/gtk/packagestab.cc:546 #, fuzzy, c-format #| msgid "Canc^el pending actions" msgid "Cancel any actions on %s." msgstr "Отменить все незаконченные действия" -#: src/gtk/packagestab.cc:525 +#: src/gtk/packagestab.cc:528 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the purge of %s." msgstr "Отменить удаление %F" -#: src/gtk/packagestab.cc:527 +#: src/gtk/packagestab.cc:530 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s." msgstr "Отменить удаление %F" -#: src/gtk/packagestab.cc:532 +#: src/gtk/packagestab.cc:535 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the upgrade of %s." msgstr "Отменить удаление %F" -#: src/gtk/packagestab.cc:534 +#: src/gtk/packagestab.cc:537 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s." msgstr "Отменить установку %F" -#: src/gtk/packagestab.cc:536 +#: src/gtk/packagestab.cc:539 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the downgrade of %s." msgstr "Отменить удаление %F" -#: src/gtk/packagestab.cc:538 +#: src/gtk/packagestab.cc:541 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the reinstallation of %s." msgstr "Отменить установку %F" -#: src/gtk/packagestab.cc:579 +#: src/gtk/packagestab.cc:582 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "Remove %s" msgstr "Удалить(%s)" -#: src/gtk/packagestab.cc:583 +#: src/gtk/packagestab.cc:586 #, fuzzy, c-format #| msgid "^Purge" msgid "Purge %s" msgstr "^Purge" -#: src/gtk/packagestab.cc:591 +#: src/gtk/packagestab.cc:594 #, c-format msgid "Hold %s at its current version." msgstr "" -#: src/gtk/packagestab.cc:596 +#: src/gtk/packagestab.cc:599 #, fuzzy, c-format #| msgid "'&M' to mark packages as automatically installed" msgid "Mark %s as automatically installed." msgstr "'&M' пометить пакеты как автоматически установленные" -#: src/gtk/packagestab.cc:601 +#: src/gtk/packagestab.cc:604 #, fuzzy, c-format #| msgid "The package \"%s\" is manually installed.\n" msgid "Mark %s as manually installed." msgstr "Пакет \"%s\" установлен вручную.\n" -#: src/gtk/packagestab.cc:643 +#: src/gtk/packagestab.cc:646 #, fuzzy, c-format #| msgid "\"%s\" is a virtual package provided by:\n" msgid "%s is a virtual package provided by:\n" msgstr "\"%s\" является виртуальным пакетом, предоставленный:\n" -#: src/gtk/packagestab.cc:707 src/gtk/previewtab.cc:210 +#: src/gtk/packagestab.cc:710 src/gtk/previewtab.cc:215 msgid "(more info...)" msgstr "" -#: src/gtk/packagestab.cc:736 +#: src/gtk/packagestab.cc:739 #, fuzzy #| msgid "Source Package: " msgid "Source: " @@ -4471,28 +4356,28 @@ msgstr "%s; будет установлен автоматически" msgid "%s is being installed manually." msgstr "%s; будет установлен автоматически" -#: src/gtk/pkgview.cc:399 +#: src/gtk/pkgview.cc:401 msgid "Cache reloading, please wait..." msgstr "" -#: src/gtk/pkgview.cc:604 +#: src/gtk/pkgview.cc:607 #, fuzzy #| msgid "Search" msgid "Searching..." msgstr "Поиск" -#: src/gtk/pkgview.cc:715 +#: src/gtk/pkgview.cc:718 #, fuzzy #| msgid "Building view" msgid "Finalizing view" msgstr "Построение вида" -#: src/gtk/pkgview.cc:715 src/pkg_tree.cc:204 src/pkg_tree.cc:215 +#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238 msgid "Building view" msgstr "Построение вида" -#: src/gtk/previewtab.cc:96 src/pkg_grouppolicy.cc:637 +#: src/gtk/previewtab.cc:97 src/pkg_grouppolicy.cc:637 msgid "" "Packages with unsatisfied dependencies\n" " The dependency requirements of these packages will be unmet after the " @@ -4508,7 +4393,7 @@ msgstr "" " Существование этого дерева, вероятно, говорит о том, что что-то испортилось " "в вашей системе или в архиве Debian." -#: src/gtk/previewtab.cc:97 src/pkg_grouppolicy.cc:638 +#: src/gtk/previewtab.cc:98 src/pkg_grouppolicy.cc:638 msgid "" "Packages being removed because they are no longer used\n" " These packages are being deleted because they were automatically installed " @@ -4520,7 +4405,7 @@ msgstr "" "удовлетворения зависимостей, а планируемое действие приведёт к тому, что не " "останется пакетов, объявляющих 'важных' зависимостей от них.\n" -#: src/gtk/previewtab.cc:98 src/pkg_grouppolicy.cc:639 +#: src/gtk/previewtab.cc:99 src/pkg_grouppolicy.cc:639 msgid "" "Packages being automatically held in their current state\n" " These packages could be upgraded, but they have been kept in their current " @@ -4530,7 +4415,7 @@ msgstr "" " Хотя эти пакеты могут быть обновлены, но они сохранят своё текущее " "состояние во избежании порчи зависимостей." -#: src/gtk/previewtab.cc:99 src/pkg_grouppolicy.cc:640 +#: src/gtk/previewtab.cc:100 src/pkg_grouppolicy.cc:640 msgid "" "Packages being automatically installed to satisfy dependencies\n" " These packages are being installed because they are required by another " @@ -4540,7 +4425,7 @@ msgstr "" " Эти пакеты устанавливаются, так как они нужны другим пакетам, которые вы " "выбрали для установки." -#: src/gtk/previewtab.cc:100 src/pkg_grouppolicy.cc:641 +#: src/gtk/previewtab.cc:101 src/pkg_grouppolicy.cc:641 msgid "" "Packages being deleted due to unsatisfied dependencies\n" " These packages are being deleted because one or more of their dependencies " @@ -4550,7 +4435,7 @@ msgstr "" " Эти пакеты удаляются, так как одна или более их зависимостей больше " "недоступна, или потому что другой пакет конфликтует с ними." -#: src/gtk/previewtab.cc:101 src/pkg_grouppolicy.cc:642 +#: src/gtk/previewtab.cc:102 src/pkg_grouppolicy.cc:642 msgid "" "Packages to be downgraded\n" " An older version of these packages than is currently installed will be " @@ -4559,7 +4444,7 @@ msgstr "" "Пакеты, которые будут заменены на более старые\n" " Будут установлены более старые версии пакетов, чем установлены сейчас." -#: src/gtk/previewtab.cc:102 src/pkg_grouppolicy.cc:643 +#: src/gtk/previewtab.cc:103 src/pkg_grouppolicy.cc:643 msgid "" "Packages being held back\n" " These packages could be upgraded, but you have asked for them to be held at " @@ -4569,7 +4454,7 @@ msgstr "" " Хотя эти пакеты могут быть обновлены, вы попросили оставить их текущую " "версию." -#: src/gtk/previewtab.cc:103 src/pkg_grouppolicy.cc:644 +#: src/gtk/previewtab.cc:104 src/pkg_grouppolicy.cc:644 msgid "" "Packages to be reinstalled\n" " These packages will be reinstalled." @@ -4577,7 +4462,7 @@ msgstr "" "Переустанавливаемые пакеты\n" " Эти пакеты будут переустановлены." -#: src/gtk/previewtab.cc:104 src/pkg_grouppolicy.cc:645 +#: src/gtk/previewtab.cc:105 src/pkg_grouppolicy.cc:645 msgid "" "Packages to be installed\n" " These packages have been manually selected for installation on your " @@ -4586,7 +4471,7 @@ msgstr "" "Устанавливаемые пакеты\n" " Эти пакеты были выбраны вручную для установки на ваш компьютер." -#: src/gtk/previewtab.cc:105 src/pkg_grouppolicy.cc:646 +#: src/gtk/previewtab.cc:106 src/pkg_grouppolicy.cc:646 msgid "" "Packages to be removed\n" " These packages have been manually selected for removal." @@ -4594,7 +4479,7 @@ msgstr "" "Удаляемые пакеты\n" " Эти пакеты были выбраны вручную для удаления." -#: src/gtk/previewtab.cc:106 src/pkg_grouppolicy.cc:647 +#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:647 msgid "" "Packages to be upgraded\n" " These packages will be upgraded to a newer version." @@ -4602,7 +4487,7 @@ msgstr "" "Обновляемые пакеты\n" " Эти пакеты будут обновлены до последней версии." -#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:648 +#: src/gtk/previewtab.cc:108 src/pkg_grouppolicy.cc:648 msgid "" "Packages that are partially installed\n" " These packages are not fully installed and configured; an attempt will be " @@ -4612,7 +4497,7 @@ msgstr "" " Эти пакеты не полностью установлены и настроены; будет предпринята попытка " "завершить их установку." -#: src/gtk/previewtab.cc:174 +#: src/gtk/previewtab.cc:179 #, fuzzy #| msgid "Preview" msgid "Preview: " @@ -4633,119 +4518,125 @@ msgid "" "%s" msgstr "" -#: src/gtk/resolver.cc:201 src/solution_fragment.cc:275 +#: src/gtk/resolver.cc:207 +#, fuzzy +#| msgid "Package" +msgid "Virtual package" +msgstr "Пакет" + +#: src/gtk/resolver.cc:241 src/solution_fragment.cc:275 msgid "Not Installed" msgstr "Не установлен" -#: src/gtk/resolver.cc:332 +#: src/gtk/resolver.cc:372 #, fuzzy, c-format #| msgid "Removing %s" msgid "Removing %s is rejected." msgstr "Удаляется %s" -#: src/gtk/resolver.cc:337 +#: src/gtk/resolver.cc:377 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Canceling the installation of %s is rejected." msgstr "Отменить установку %F" -#: src/gtk/resolver.cc:347 +#: src/gtk/resolver.cc:387 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Canceling the removal of %s is rejected." msgstr "Отменить удаление %F" -#: src/gtk/resolver.cc:350 +#: src/gtk/resolver.cc:390 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keeping %s at version %s is rejected." msgstr "Оставить %F версии %s (%s)" -#: src/gtk/resolver.cc:357 +#: src/gtk/resolver.cc:397 #, fuzzy, c-format #| msgid "Install(%s provides %s)" msgid "Installing %s version %s is rejected." msgstr "Установить(%s предоставляет %s)" -#: src/gtk/resolver.cc:363 +#: src/gtk/resolver.cc:403 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "Downgrading %s to version %s is rejected." msgstr " Версия cwidget: %s\n" -#: src/gtk/resolver.cc:369 +#: src/gtk/resolver.cc:409 #, fuzzy, c-format #| msgid "%s versions" msgid "Upgrading %s to version %s is rejected." msgstr "%s версии" -#: src/gtk/resolver.cc:386 +#: src/gtk/resolver.cc:426 #, c-format msgid "Removing %s is preferred over all un-accepted alternatives." msgstr "" -#: src/gtk/resolver.cc:391 +#: src/gtk/resolver.cc:431 #, c-format msgid "" "Canceling the installation of %s is preferred over all un-accepted " "alternatives." msgstr "" -#: src/gtk/resolver.cc:401 +#: src/gtk/resolver.cc:441 #, c-format msgid "" "Canceling the removal of %s is preferred over all un-accepted alternatives." msgstr "" -#: src/gtk/resolver.cc:404 +#: src/gtk/resolver.cc:444 #, c-format msgid "" "Keeping %s at version %s is preferred over all un-accepted alternatives." msgstr "" -#: src/gtk/resolver.cc:411 +#: src/gtk/resolver.cc:451 #, c-format msgid "" "Installing %s version %s is preferred over all un-accepted alternatives." msgstr "" -#: src/gtk/resolver.cc:417 +#: src/gtk/resolver.cc:457 #, c-format msgid "" "Downgrading %s to version %s is preferred over all un-accepted alternatives." msgstr "" -#: src/gtk/resolver.cc:423 +#: src/gtk/resolver.cc:463 #, c-format msgid "" "Upgrading %s to version %s is preferred over all un-accpted alternatives." msgstr "" -#: src/gtk/resolver.cc:441 +#: src/gtk/resolver.cc:481 #, c-format msgid "Leaving %ls unresolved is rejected." msgstr "" -#: src/gtk/resolver.cc:447 +#: src/gtk/resolver.cc:487 #, c-format msgid "Leaving %ls unresolved is preferred over all un-accepted alternatives." msgstr "" -#: src/gtk/resolver.cc:851 +#: src/gtk/resolver.cc:905 msgid "How to treat the selected action" msgid_plural "How to treat the selected actions" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/gtk/resolver.cc:855 +#: src/gtk/resolver.cc:909 msgid "Ignore solutions containing this action." msgid_plural "Ignore solutions containing these actions." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/gtk/resolver.cc:859 +#: src/gtk/resolver.cc:913 msgid "" "Allow solutions containing this action, but do not prefer them to other " "solutions." @@ -4756,7 +4647,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/gtk/resolver.cc:863 +#: src/gtk/resolver.cc:917 msgid "" "Always prefer this action over alternatives that have not been accepted." msgid_plural "" @@ -4765,192 +4656,204 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/gtk/resolver.cc:1172 src/solution_fragment.cc:108 +#: src/gtk/resolver.cc:1226 src/solution_fragment.cc:108 #, c-format msgid "%s depends upon %s" msgstr "%s зависит от %s" -#: src/gtk/resolver.cc:1175 src/solution_fragment.cc:111 +#: src/gtk/resolver.cc:1229 src/solution_fragment.cc:111 #, c-format msgid "%s pre-depends upon %s" msgstr "%s сначала зависит от %s" -#: src/gtk/resolver.cc:1178 src/solution_fragment.cc:114 +#: src/gtk/resolver.cc:1232 src/solution_fragment.cc:114 #, c-format msgid "%s suggests %s" msgstr "%s предлагает %s" -#: src/gtk/resolver.cc:1181 src/solution_fragment.cc:117 +#: src/gtk/resolver.cc:1235 src/solution_fragment.cc:117 #: src/solution_item.cc:603 #, c-format msgid "%s recommends %s" msgstr "%s рекомендует %s" -#: src/gtk/resolver.cc:1184 src/solution_fragment.cc:120 +#: src/gtk/resolver.cc:1238 src/solution_fragment.cc:120 #, c-format msgid "%s conflicts with %s" msgstr "%s конфликтует с %s" -#: src/gtk/resolver.cc:1187 src/solution_fragment.cc:123 +#: src/gtk/resolver.cc:1241 src/solution_fragment.cc:123 #, c-format msgid "%s breaks %s" msgstr "%s ломает %s" -#: src/gtk/resolver.cc:1190 src/solution_fragment.cc:126 +#: src/gtk/resolver.cc:1244 src/solution_fragment.cc:126 #, c-format msgid "%s replaces %s" msgstr "%s замещает %s" -#: src/gtk/resolver.cc:1193 src/solution_fragment.cc:129 +#: src/gtk/resolver.cc:1247 src/solution_fragment.cc:129 #, c-format msgid "%s obsoletes %s" msgstr "%s делает устаревшим %s" -#: src/gtk/resolver.cc:1303 src/gtk/resolver.cc:1757 +#: src/gtk/resolver.cc:1359 src/gtk/resolver.cc:1824 #: src/solution_screen.cc:271 msgid "Remove the following packages:" msgstr "Удалить следующие пакеты:" -#: src/gtk/resolver.cc:1317 src/gtk/resolver.cc:1769 +#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1836 #: src/solution_screen.cc:295 msgid "Install the following packages:" msgstr "Установить следующие пакеты:" -#: src/gtk/resolver.cc:1330 src/gtk/resolver.cc:1781 +#: src/gtk/resolver.cc:1386 src/gtk/resolver.cc:1848 #, fuzzy #| msgid "Remove the following packages:" msgid "Keep the following packages:" msgstr "Удалить следующие пакеты:" -#: src/gtk/resolver.cc:1343 src/gtk/resolver.cc:1793 +#: src/gtk/resolver.cc:1399 src/gtk/resolver.cc:1860 #: src/solution_screen.cc:307 msgid "Upgrade the following packages:" msgstr "Обновить следующие пакеты:" -#: src/gtk/resolver.cc:1356 src/gtk/resolver.cc:1806 +#: src/gtk/resolver.cc:1412 src/gtk/resolver.cc:1873 #: src/solution_screen.cc:319 msgid "Downgrade the following packages:" msgstr "Установить более старую версию для следующих пакетов:" -#: src/gtk/resolver.cc:1369 src/gtk/resolver.cc:1819 +#: src/gtk/resolver.cc:1425 src/gtk/resolver.cc:1886 #, fuzzy #| msgid "Leave the following dependencies unresolved:%n" msgid "Leave the following dependencies unresolved:" msgstr "Оставить следующие зависимости неразрешёнными:%n" -#: src/gtk/resolver.cc:1444 +#: src/gtk/resolver.cc:1502 #, fuzzy, c-format #| msgid "Remove %F [%s (%s)]" msgid "Remove %s [<big>%s</big> (%s)]" msgstr "Удалить %F [%s (%s)]" -#: src/gtk/resolver.cc:1451 +#: src/gtk/resolver.cc:1509 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "Install %s [<big>%s</big> (%s)]" msgstr "Установить %F [%s (%s)]" -#: src/gtk/resolver.cc:1459 +#: src/gtk/resolver.cc:1517 #, fuzzy, c-format #| msgid "Cancel the installation of %F" msgid "Cancel the installation of %s" msgstr "Отменить установку %F" -#: src/gtk/resolver.cc:1462 +#: src/gtk/resolver.cc:1520 #, fuzzy, c-format #| msgid "Cancel the removal of %F" msgid "Cancel the removal of %s" msgstr "Отменить удаление %F" -#: src/gtk/resolver.cc:1465 +#: src/gtk/resolver.cc:1523 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "Keep %s at version <big>%s</big> (%s)" msgstr "Оставить %F версии %s (%s)" -#: src/gtk/resolver.cc:1472 +#: src/gtk/resolver.cc:1530 #, fuzzy, c-format #| msgid "Upgrade %F [%s (%s) -> %s (%s)]" msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Обновить %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1481 +#: src/gtk/resolver.cc:1539 #, fuzzy, c-format #| msgid "Downgrade %F [%s (%s) -> %s (%s)]" msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "Вернуть старую версию %F [%s (%s) -> %s (%s)]" -#: src/gtk/resolver.cc:1538 +#: src/gtk/resolver.cc:1598 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>Remove</b> %s" msgstr "Удалить(%s)" -#: src/gtk/resolver.cc:1538 +#: src/gtk/resolver.cc:1598 #, fuzzy, c-format #| msgid "Remove(%s)" msgid "<b>remove</b> %s" msgstr "Удалить(%s)" -#: src/gtk/resolver.cc:1546 +#: src/gtk/resolver.cc:1607 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>Keep</b> %s at version %s" msgstr "Оставить %F версии %s (%s)" -#: src/gtk/resolver.cc:1546 +#: src/gtk/resolver.cc:1607 #, fuzzy, c-format #| msgid "Keep %F at version %s (%s)" msgid "<b>keep</b> %s at version %s" msgstr "Оставить %F версии %s (%s)" -#: src/gtk/resolver.cc:1555 +#: src/gtk/resolver.cc:1615 +#, fuzzy, c-format +#| msgid "Cancel the installation of %F" +msgid "<b>Cancel</b> the installation of %s" +msgstr "Отменить установку %F" + +#: src/gtk/resolver.cc:1615 +#, fuzzy, c-format +#| msgid "Cancel the installation of %F" +msgid "<b>cancel</b> the installation of %s" +msgstr "Отменить установку %F" + +#: src/gtk/resolver.cc:1622 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>Install</b> %s %s" msgstr "Установить %F [%s (%s)]" -#: src/gtk/resolver.cc:1555 +#: src/gtk/resolver.cc:1622 #, fuzzy, c-format #| msgid "Install %F [%s (%s)]" msgid "<b>install</b> %s %s" msgstr "Установить %F [%s (%s)]" -#: src/gtk/resolver.cc:1564 +#: src/gtk/resolver.cc:1631 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>Downgrade</b> %s to version %s" msgstr " Версия cwidget: %s\n" -#: src/gtk/resolver.cc:1564 +#: src/gtk/resolver.cc:1631 #, fuzzy, c-format #| msgid " cwidget version: %s\n" msgid "<b>downgrade</b> %s to version %s" msgstr " Версия cwidget: %s\n" -#: src/gtk/resolver.cc:1573 +#: src/gtk/resolver.cc:1640 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>Upgrade</b> %s to version %s" msgstr "%s версии" -#: src/gtk/resolver.cc:1573 +#: src/gtk/resolver.cc:1640 #, fuzzy, c-format #| msgid "%s versions" msgid "<b>upgrade</b> %s to version %s" msgstr "%s версии" -#: src/gtk/resolver.cc:1586 +#: src/gtk/resolver.cc:1653 #, c-format msgid "Leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1586 +#: src/gtk/resolver.cc:1653 #, c-format msgid "leave %s unresolved" msgstr "" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1721 #, fuzzy, c-format #| msgid "%d install" #| msgid_plural "%d installs" @@ -4960,7 +4863,7 @@ msgstr[0] "%d установлен" msgstr[1] "%d установлено" msgstr[2] "%d установлено" -#: src/gtk/resolver.cc:1659 +#: src/gtk/resolver.cc:1726 #, fuzzy, c-format #| msgid "%d removal" #| msgid_plural "%d removals" @@ -4970,7 +4873,7 @@ msgstr[0] "%d удалён" msgstr[1] "%d удалено" msgstr[2] "%d удалено" -#: src/gtk/resolver.cc:1665 +#: src/gtk/resolver.cc:1732 #, fuzzy, c-format #| msgid "%d keep" #| msgid_plural "%d keeps" @@ -4980,7 +4883,7 @@ msgstr[0] "%d оставлен" msgstr[1] "%d оставлено" msgstr[2] "%d оставлено" -#: src/gtk/resolver.cc:1671 +#: src/gtk/resolver.cc:1738 #, fuzzy, c-format #| msgid "%d upgrade" #| msgid_plural "%d upgrades" @@ -4990,7 +4893,7 @@ msgstr[0] "%d обновлён" msgstr[1] "%d обновлено" msgstr[2] "%d обновлено" -#: src/gtk/resolver.cc:1677 +#: src/gtk/resolver.cc:1744 #, fuzzy, c-format #| msgid "%d downgrade" #| msgid_plural "%d downgrades" @@ -5000,7 +4903,7 @@ msgstr[0] "%d заменён на более старые" msgstr[1] "%d заменено на более старые" msgstr[2] "%d заменено на более старые" -#: src/gtk/resolver.cc:1683 +#: src/gtk/resolver.cc:1750 #, fuzzy, c-format #| msgid "Audit ^Recommendations" msgid "%s unresolved recommendation" @@ -5009,35 +4912,35 @@ msgstr[0] "^Проверка рекомендаций" msgstr[1] "^Проверка рекомендаций" msgstr[2] "^Проверка рекомендаций" -#: src/gtk/resolver.cc:1975 +#: src/gtk/resolver.cc:2042 #, fuzzy #| msgid "No more solutions." msgid "No solutions yet." msgstr "Больше решений нет." -#: src/gtk/resolver.cc:1982 +#: src/gtk/resolver.cc:2049 #, fuzzy #| msgid "Dependency handling" msgid "No dependency solution was found." msgstr "Работа с зависимостями" -#: src/gtk/resolver.cc:1983 +#: src/gtk/resolver.cc:2050 #, fuzzy #| msgid "No more solutions." msgid "No solutions." msgstr "Больше решений нет." -#: src/gtk/resolver.cc:1994 +#: src/gtk/resolver.cc:2061 msgid "To view a solution, select it from the list to the right." msgstr "" -#: src/gtk/resolver.cc:1995 +#: src/gtk/resolver.cc:2062 #, fuzzy, c-format #| msgid "No more solutions." msgid "%u solutions." msgstr "Больше решений нет." -#: src/gtk/resolver.cc:2026 +#: src/gtk/resolver.cc:2093 #, c-format msgid "Solution %s of %s (tier %s)." msgstr "" @@ -7847,6 +7750,71 @@ msgstr "Загрузка Changelog" msgid "Download Changelog" msgstr "Загрузить Changelog" +#, fuzzy +#~| msgid "^Install/remove packages" +#~ msgid "_Install/Remove Packages" +#~ msgstr "^Установить/удалить пакеты" + +#, fuzzy +#~| msgid "^Update package list" +#~ msgid "_Update Package List" +#~ msgstr "^Обновить список пакетов" + +#, fuzzy +#~| msgid "Mark Up^gradable" +#~ msgid "Mark Up_gradable" +#~ msgstr "Пометить ^обновляемые" + +#, fuzzy +#~| msgid "^Forget new packages" +#~ msgid "_Forget New Packages" +#~ msgstr "^Забыть о новых пакетах" + +#, fuzzy +#~| msgid "Canc^el pending actions" +#~ msgid "Canc_el Pending Actions" +#~ msgstr "Отменить все незаконченные действия" + +#, fuzzy +#~| msgid "^Clean package cache" +#~ msgid "C_lean Package Cache" +#~ msgstr "^Очистить кеш пакетов" + +#, fuzzy +#~| msgid "Clean ^obsolete files" +#~ msgid "Clean _Obsolete Files" +#~ msgstr "Очистить ^устаревшие файлы" + +#, fuzzy +#~| msgid "^Reload package cache" +#~ msgid "_Reload Package Cache" +#~ msgstr "^Перезагрузить кеш пакетов" + +#, fuzzy +#~| msgid "^Play Minesweeper" +#~ msgid "_Play Minesweeper" +#~ msgstr "^Играть в сапёра" + +#, fuzzy +#~| msgid "Become root" +#~ msgid "_Become Root" +#~ msgstr "Стать суперпользователем" + +#, fuzzy +#~| msgid "^Quit" +#~ msgid "_Quit" +#~ msgstr "^Выйти" + +#, fuzzy +#~| msgid "delete" +#~ msgid "gtk-delete" +#~ msgstr "delete" + +#, fuzzy +#~| msgid "Dependency handling" +#~ msgid "Find _Dependency Chains" +#~ msgstr "Работа с зависимостями" + #~ msgid "(for %s)" #~ msgid_plural "(for %s)" #~ msgstr[0] "(для %s)" |